Browse Source

样式调整

sunny 2 weeks ago
parent
commit
17d602b334

+ 45 - 53
ruoyi-ui/src/views/project/approval/myTask.vue

@@ -67,7 +67,7 @@
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
 
 
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                   @click.stop="handleInvestOppDetail(scope.row)">
                   @click.stop="handleInvestOppDetail(scope.row)">
@@ -75,11 +75,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
@@ -97,7 +97,7 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="90">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -113,21 +113,21 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目概况" align="center" prop="projectOverview">
+            <el-table-column label="项目概况" align="center" prop="projectOverview" width="70">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectOverview">
                 <div :title="scope.row.projectOverview">
                   {{ scope.row.projectOverview }}
                   {{ scope.row.projectOverview }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目亮点" align="center" prop="projectSparkle">
+            <el-table-column label="项目亮点" align="center" prop="projectSparkle" width="70">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectSparkle">
                 <div :title="scope.row.projectSparkle">
                   {{ scope.row.projectSparkle }}
                   {{ scope.row.projectSparkle }}
@@ -135,26 +135,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="40">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -162,14 +162,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -212,10 +212,9 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myDoneTaskList">
             :data="myDoneTaskList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-            <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+           <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                   @click.stop="handleInvestOppDetail(scope.row)">
                   @click.stop="handleInvestOppDetail(scope.row)">
@@ -223,12 +222,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
@@ -246,7 +244,7 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="90">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -262,22 +260,21 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-
-            <el-table-column label="项目概况" align="center" prop="projectOverview">
+            <el-table-column label="项目概况" align="center" prop="projectOverview" width="70">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectOverview">
                 <div :title="scope.row.projectOverview">
                   {{ scope.row.projectOverview }}
                   {{ scope.row.projectOverview }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目亮点" align="center" prop="projectSparkle">
+            <el-table-column label="项目亮点" align="center" prop="projectSparkle" width="70">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectSparkle">
                 <div :title="scope.row.projectSparkle">
                   {{ scope.row.projectSparkle }}
                   {{ scope.row.projectSparkle }}
@@ -285,45 +282,41 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="40">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
-                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName }}
                   {{ scope.row.taskName }}
                 </div>
                 </div>
-                <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName }}
-                </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -335,7 +328,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!--  -->
             <!--  -->
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
               </template>
@@ -350,9 +343,9 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myList">
             :data="myList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+           <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                   @click.stop="handleInvestOppDetail(scope.row)">
                   @click.stop="handleInvestOppDetail(scope.row)">
@@ -360,12 +353,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
@@ -383,7 +375,7 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="90">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -399,7 +391,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -413,7 +405,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目亮点" align="center" prop="projectSparkle">
+            <el-table-column label="项目亮点" align="center" prop="projectSparkle" width="70">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectSparkle">
                 <div :title="scope.row.projectSparkle">
                   {{ scope.row.projectSparkle }}
                   {{ scope.row.projectSparkle }}
@@ -421,26 +413,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="40">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -448,14 +440,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -467,7 +459,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!--  -->
             <!--  -->
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
               </template>

+ 34 - 40
ruoyi-ui/src/views/project/decision/myTask.vue

@@ -72,11 +72,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
@@ -94,7 +94,7 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -110,7 +110,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -125,26 +125,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -152,14 +152,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -213,11 +213,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
@@ -235,8 +235,7 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <!-- projectStatus -->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -252,7 +251,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -267,45 +266,41 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
-                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName }}
                   {{ scope.row.taskName }}
                 </div>
                 </div>
-                <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName }}
-                </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -317,7 +312,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!--  -->
             <!--  -->
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small"
                 <el-button style="color:#1890ff" type="text" size="small"
                   @click="handleDetail(scope.row)">详情</el-button>
                   @click="handleDetail(scope.row)">详情</el-button>
@@ -333,7 +328,7 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myList">
             :data="myList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
+           <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="150">
             <el-table-column label="项目名称" align="center" prop="projectName" width="150">
@@ -344,11 +339,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
@@ -366,8 +361,7 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <!-- projectStatus -->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -383,7 +377,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -398,26 +392,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -425,14 +419,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -443,7 +437,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small"
                 <el-button style="color:#1890ff" type="text" size="small"
                   @click="handleDetail(scope.row)">详情</el-button>
                   @click="handleDetail(scope.row)">详情</el-button>

+ 0 - 1
ruoyi-ui/src/views/project/investOpp/audit.vue

@@ -996,7 +996,6 @@ export default {
     margin-top: 40px;
     margin-top: 40px;
     .el-form-item {
     .el-form-item {
       width: 100%; /* 让表单占满父容器 */
       width: 100%; /* 让表单占满父容器 */
-      min-width: 600px; /* 防止过小(可选) */
     }
     }
     .special-el-form {
     .special-el-form {
       margin-left: 0px;
       margin-left: 0px;

+ 0 - 1
ruoyi-ui/src/views/project/investOpp/detail.vue

@@ -961,7 +961,6 @@ export default {
     margin-top: 40px;
     margin-top: 40px;
     .el-form-item {
     .el-form-item {
       width: 100%; /* 让表单占满父容器 */
       width: 100%; /* 让表单占满父容器 */
-      min-width: 600px; /* 防止过小(可选) */
     }
     }
     .special-el-form {
     .special-el-form {
       margin-left: 0px;
       margin-left: 0px;

+ 78 - 64
ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -80,21 +80,21 @@
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName">
                 <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                   {{ scope.row.projectName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName" width="120">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -149,7 +149,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -157,7 +157,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
             <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div v-if="
                 <div v-if="
                   scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
                   scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
@@ -173,14 +173,14 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
@@ -194,12 +194,12 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -207,14 +207,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -255,24 +255,24 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myDoneTaskList">
             :data="myDoneTaskList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
+             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName">
                 <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                   {{ scope.row.projectName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName" width="120">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -297,6 +297,18 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
+
+            <!--            <el-table-column
+              label="备案时间"
+              align="center"
+              prop="tProjectCompany.filingTime"
+            >
+              <template slot-scope="scope">
+          <span>{{
+              parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
+            }}</span>
+              </template>
+            </el-table-column>-->
             <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
             <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
@@ -315,25 +327,15 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <!--            <el-table-column
-              label="备案时间"
-              align="center"
-              prop="tProjectCompany.filingTime"
-            >
-              <template slot-scope="scope">
-          <span>{{
-              parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
-            }}</span>
-              </template>
-            </el-table-column>-->
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
+            <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div v-if="
                 <div v-if="
                   scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
                   scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
@@ -349,45 +351,48 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <!--            <el-table-column label="申请人" align="center" prop="startUserName">
+              <template slot-scope="scope">
+                <div :title="scope.row.startUserName">
+                  {{ scope.row.startUserName }}
+                </div>
+              </template>
+            </el-table-column>-->
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
-                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName }}
                   {{ scope.row.taskName }}
                 </div>
                 </div>
-                <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName }}
-                </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -398,7 +403,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
               </template>
@@ -413,24 +418,24 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myList">
             :data="myList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
+             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName">
                 <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                   {{ scope.row.projectName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName" width="120">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -455,6 +460,18 @@
                 />
                 />
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
+
+            <!--            <el-table-column
+              label="备案时间"
+              align="center"
+              prop="tProjectCompany.filingTime"
+            >
+              <template slot-scope="scope">
+          <span>{{
+              parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
+            }}</span>
+              </template>
+            </el-table-column>-->
             <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
             <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
@@ -473,25 +490,15 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>-->
             </el-table-column>-->
-            <!--            <el-table-column
-              label="备案时间"
-              align="center"
-              prop="tProjectCompany.filingTime"
-            >
-              <template slot-scope="scope">
-          <span>{{
-              parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
-            }}</span>
-              </template>
-            </el-table-column>-->
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
+            <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div v-if="
                 <div v-if="
                   scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
                   scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
@@ -507,26 +514,33 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <!--            <el-table-column label="申请人" align="center" prop="startUserName">
+              <template slot-scope="scope">
+                <div :title="scope.row.startUserName">
+                  {{ scope.row.startUserName }}
+                </div>
+              </template>
+            </el-table-column>-->
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -534,14 +548,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -552,7 +566,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
                 <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
               </template>

+ 43 - 49
ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -67,7 +67,7 @@
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                   @click.stop="handleInvestOppDetail(scope.row)">
                   @click.stop="handleInvestOppDetail(scope.row)">
@@ -75,16 +75,16 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="90">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -100,21 +100,21 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="尽调名称" align="center" prop="investigateName">
+            <el-table-column label="尽调名称" align="center" prop="investigateName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investigateName">
                 <div :title="scope.row.investigateName">
                   {{ scope.row.investigateName }}
                   {{ scope.row.investigateName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="尽调地点" align="center" prop="investigatePlace">
+            <el-table-column label="尽调地点" align="center" prop="investigatePlace" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investigatePlace">
                 <div :title="scope.row.investigatePlace">
                   {{ scope.row.investigatePlace }}
                   {{ scope.row.investigatePlace }}
@@ -122,26 +122,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -149,14 +149,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -199,10 +199,9 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myDoneTaskList">
             :data="myDoneTaskList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                   @click.stop="handleInvestOppDetail(scope.row)">
                   @click.stop="handleInvestOppDetail(scope.row)">
@@ -210,16 +209,16 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="90">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -235,21 +234,21 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="尽调名称" align="center" prop="investigateName">
+            <el-table-column label="尽调名称" align="center" prop="investigateName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investigateName">
                 <div :title="scope.row.investigateName">
                   {{ scope.row.investigateName }}
                   {{ scope.row.investigateName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="尽调地点" align="center" prop="investigatePlace">
+            <el-table-column label="尽调地点" align="center" prop="investigatePlace" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investigatePlace">
                 <div :title="scope.row.investigatePlace">
                   {{ scope.row.investigatePlace }}
                   {{ scope.row.investigatePlace }}
@@ -257,45 +256,41 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
-                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName }}
                   {{ scope.row.taskName }}
                 </div>
                 </div>
-                <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName }}
-                </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -307,7 +302,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!--  -->
             <!--  -->
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small"
                 <el-button style="color:#1890ff" type="text" size="small"
                   @click="handleDetail(scope.row)">详情</el-button>
                   @click="handleDetail(scope.row)">详情</el-button>
@@ -323,10 +318,9 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myList">
             :data="myList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150">
+            <el-table-column label="项目名称" align="center" prop="projectName">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                   @click.stop="handleInvestOppDetail(scope.row)">
                   @click.stop="handleInvestOppDetail(scope.row)">
@@ -334,16 +328,16 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <el-table-column label="所属行业" align="center" prop="industry" width="60"><template slot-scope="scope">
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
                 <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <el-table-column label="项目阶段" align="center" prop="projectStage" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
                 <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus" width="90">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
                 <!-- 定义状态文本映射对象 -->
                 <el-tag :type="{
                 <el-tag :type="{
@@ -359,21 +353,21 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="尽调名称" align="center" prop="investigateName">
+            <el-table-column label="尽调名称" align="center" prop="investigateName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investigateName">
                 <div :title="scope.row.investigateName">
                   {{ scope.row.investigateName }}
                   {{ scope.row.investigateName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="尽调地点" align="center" prop="investigatePlace">
+            <el-table-column label="尽调地点" align="center" prop="investigatePlace" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investigatePlace">
                 <div :title="scope.row.investigatePlace">
                   {{ scope.row.investigatePlace }}
                   {{ scope.row.investigatePlace }}
@@ -381,26 +375,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -408,14 +402,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -426,7 +420,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small"
                 <el-button style="color:#1890ff" type="text" size="small"
                   @click="handleDetail(scope.row)">详情</el-button>
                   @click="handleDetail(scope.row)">详情</el-button>

+ 25 - 31
ruoyi-ui/src/views/project/termination/myTask.vue

@@ -109,7 +109,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -124,26 +124,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -151,14 +151,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -201,9 +201,8 @@
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
           <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
             :data="myDoneTaskList">
             :data="myDoneTaskList">
-            <!--            <el-table-column type="selection" width="40" align="center" />-->
+             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-            <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="150">
             <el-table-column label="项目名称" align="center" prop="projectName" width="150">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
@@ -250,7 +249,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -265,45 +264,41 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
-                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName }}
                   {{ scope.row.taskName }}
                 </div>
                 </div>
-                <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName }}
-                </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -314,7 +309,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small"
                 <el-button style="color:#1890ff" type="text" size="small"
                   @click="handleDetail(scope.row)">详情</el-button>
                   @click="handleDetail(scope.row)">详情</el-button>
@@ -332,7 +327,6 @@
             :data="myList">
             :data="myList">
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-            <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="150">
             <el-table-column label="项目名称" align="center" prop="projectName" width="150">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
                 <div :title="scope.row.projectName" class="public-text-blue public-cursor"
@@ -379,7 +373,7 @@
                 </el-tag>
                 </el-tag>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="项目负责人" align="center" prop="investHead">
+            <el-table-column label="项目负责人" align="center" prop="investHead" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
                 <div :title="scope.row.investHead">
                   {{ scope.row.investHead }}
                   {{ scope.row.investHead }}
@@ -394,26 +388,26 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <!-- delFlag -->
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="delFlag">
+            <el-table-column label="状态" align="center" prop="delFlag" width="50">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                 <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                   {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+            <el-table-column label="申请人" align="center" prop="startUserName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                   {{ scope.row.startUserName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" prop="createTime">
+            <el-table-column label="申请日期" align="center" prop="createTime" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor"
                   @click="handleReadImage(scope.row)">
                   @click="handleReadImage(scope.row)">
@@ -421,14 +415,14 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="当前处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName" width="80">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName }}
                   {{ scope.row.assigneeName }}
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="流程状态" align="center" prop="status">
+            <el-table-column label="流程状态" align="center" prop="status" width="60">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div :title="scope.row.status">
                 <div :title="scope.row.status">
                   <span v-if="scope.row.status === 0">暂存</span>
                   <span v-if="scope.row.status === 0">暂存</span>
@@ -439,7 +433,7 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button style="color:#1890ff" type="text" size="small"
                 <el-button style="color:#1890ff" type="text" size="small"
                   @click="handleDetail(scope.row)">详情</el-button>
                   @click="handleDetail(scope.row)">详情</el-button>