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