修复bug

273548560@qq.com
1 parent d084e863
Showing 14 changed files with 14 additions and 0 deletions
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/office/conference/index.vue
trash-ui/src/views/office/handle/index.vue
trash-ui/src/views/office/leaveApplication/index.vue
trash-ui/src/views/office/logistics/index.vue
trash-ui/src/views/office/management/index.vue
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
trash-workFlow/src/main/java/com/trash/office/domain/Conference.java
trash-workFlow/src/main/java/com/trash/office/domain/ContractManagement.java
trash-workFlow/src/main/java/com/trash/office/domain/HandleAffairs.java
trash-workFlow/src/main/java/com/trash/office/domain/LeaveApplication.java
trash-workFlow/src/main/java/com/trash/office/domain/LogisticsManagement.java
@@ -80,6 +80,7 @@
  
     <el-table v-loading="loading" :data="violationCaseFileList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="所属区域" align="center" prop="owningRegion" />
       <el-table-column label="违规对象" align="center" prop="projectName" />
       <el-table-column label="违规对象类型" align="center" prop="violationObjectType">
@@ -72,6 +72,7 @@
  
     <el-table v-loading="loading" :data="violationWarningInformationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="所属区域" align="center" prop="owningRegion" />
       <el-table-column label="违规对象" align="center" prop="projectName" />
       <el-table-column label="违规对象类型" align="center" prop="violationObjectType" >
@@ -72,6 +72,7 @@
  
     <el-table v-loading="loading" :data="conferenceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="会议时间" align="center" prop="conferenceTime"/>
       <el-table-column label="会议地点" align="center" prop="conferenceSite"/>
       <el-table-column label="参会人员" align="center" prop="staff"/>
@@ -104,6 +104,7 @@
  
     <el-table v-loading="loading" :data="handleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="办文办事类型" align="center" prop="type" >
         <template slot-scope="scope">
           <span>{{ typeOfName(scope.row.type) }}</span>
@@ -82,6 +82,7 @@
  
     <el-table v-loading="loading" :data="leaveApplicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="申请人" align="center" prop="applicant"/>>
       <el-table-column label="联系方式" align="center" prop="phone"/>
       <el-table-column label="请假类型" align="center" prop="type"/>
@@ -93,6 +93,7 @@
  
     <el-table v-loading="loading" :data="logisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="申请部门" align="center" prop="deptName"/>
       <!--   用章申请   -->
       <el-table-column label="用章类型" align="center" prop="sealType" v-if="type==0"/>
@@ -74,6 +74,7 @@
  
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="合同名称" align="center" prop="contractName"/>
       <el-table-column label="乙方" align="center" prop="secondParty"/>
       <el-table-column label="责任科室" align="center" prop="deptName"/>
@@ -18,6 +18,7 @@ public class ViolationCaseFile extends BaseEntity
     private static final long serialVersionUID = 1L;
  
     /** $column.columnComment */
+    @Excel(name = "序号")
     private Long id;
  
     /** 案卷编号 */
@@ -20,6 +20,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
  
     /**
@@ -20,6 +20,7 @@ public class Conference extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
  
     /**
@@ -20,6 +20,7 @@ public class ContractManagement extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
  
     /**
@@ -20,6 +20,7 @@ public class HandleAffairs extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
  
     /**
@@ -20,6 +20,7 @@ public class LeaveApplication extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
  
     /**
@@ -20,6 +20,7 @@ public class LogisticsManagement extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
  
     /**