diff --git a/src/views/project/trainPlan/TrainPlanForm.vue b/src/views/project/trainPlan/TrainPlanForm.vue
index f95c9fe..d6325ea 100644
--- a/src/views/project/trainPlan/TrainPlanForm.vue
+++ b/src/views/project/trainPlan/TrainPlanForm.vue
@@ -120,22 +120,32 @@ export default {
/** 提示框 START */
showConfirm() {
-
- this.$confirm({
- title: '提示',
- content: h => 关闭后当前未保存的数据将丢失! 确认关闭吗?,
- onOk() {
- this.$router.push({
- path: '/trainPlan/list/' + this.$route.query.t,
- query: {
- t: this.queryParam.type, //自主项目还是系统项目,控制路由跳转
- trainPlanPageNum: this.$route.query.trainPlanPageNum, //当前页
- },
- })
- },
- onCancel() { console.log('Cancel'); },
- class: 'test',
- });
+ let _this = this;
+ if (this.disabled) {
+ console.log('------1--------')
+ _this.$router.push({
+ path: '/trainPlan/list/' + _this.$route.query.t,
+ query: {
+ trainPlanPageNum: _this.$route.query.trainPlanPageNum, //当前页
+ },
+ });
+ } else {
+ console.log('------2--------')
+ this.$confirm({
+ title: '提示',
+ content: h => 关闭后当前未保存的数据将丢失! 确认关闭吗?,
+ onOk() {
+ _this.$router.push({
+ path: '/trainPlan/list/' + _this.$route.query.t,
+ query: {
+ trainPlanPageNum: _this.$route.query.trainPlanPageNum, //当前页
+ },
+ });
+ },
+ onCancel() { console.log('Cancel'); },
+ class: 'test',
+ });
+ }
},
/** 提示框 END */
@@ -201,6 +211,9 @@ export default {
this.selectedRows = res.data.projects;
this.selectedRowKeys = res.data.projectIds;
this.disabled = this.$route.query.showDetail === 'true' ? true : false;
+ this.columns = this.columns.filter(item => { return item.key != 'createBy' })
+ this.columns = this.columns.filter(item => { return item.key != 'createDate' })
+
})
}
if (this.$route.query.t != 'year') {
diff --git a/src/views/project/trainPlan/TrainPlanList.vue b/src/views/project/trainPlan/TrainPlanList.vue
index 7e45bcd..d6fb2cb 100644
--- a/src/views/project/trainPlan/TrainPlanList.vue
+++ b/src/views/project/trainPlan/TrainPlanList.vue
@@ -17,7 +17,7 @@
新增培训计划
-
+
{{ index + 1 }}
@@ -27,8 +27,6 @@
删除
- 编辑
-
详情