Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
commit
7aef14617c
|
@ -72,7 +72,7 @@
|
|||
<el-form-item label="文件名" prop="NAME">
|
||||
<el-input v-model="form.NAME" placeholder="这里输入名称..." />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件">
|
||||
<el-form-item label="附件" prop="FILE">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:on-preview="handlePictureCardPreview"
|
||||
|
@ -131,7 +131,8 @@ export default {
|
|||
FFILE: []
|
||||
},
|
||||
rules: {
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
|
||||
FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -302,6 +303,10 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message({
|
||||
message: '批量删除成功',
|
||||
type: 'success'
|
||||
})
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
<el-form-item label="文件名" prop="NAME">
|
||||
<el-input v-model="form.NAME" placeholder="这里输入名称..." />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件">
|
||||
<el-form-item label="附件" prop="FILE">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:on-preview="handlePictureCardPreview"
|
||||
|
@ -131,7 +131,8 @@ export default {
|
|||
FFILE: []
|
||||
},
|
||||
rules: {
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
|
||||
FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -305,6 +306,10 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message({
|
||||
message: '批量删除成功',
|
||||
type: 'success'
|
||||
})
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
<el-form-item label="文件名" prop="NAME">
|
||||
<el-input v-model="form.NAME" placeholder="这里输入名称..." />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件">
|
||||
<el-form-item label="附件" prop="FILE">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:on-preview="handlePictureCardPreview"
|
||||
|
@ -131,7 +131,8 @@ export default {
|
|||
FFILE: []
|
||||
},
|
||||
rules: {
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
|
||||
FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -305,6 +306,10 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message({
|
||||
message: '批量删除成功',
|
||||
type: 'success'
|
||||
})
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
<el-form-item label="文件名" prop="NAME">
|
||||
<el-input v-model="form.NAME" placeholder="这里输入名称..." />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件">
|
||||
<el-form-item label="附件" prop="FILE">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:on-preview="handlePictureCardPreview"
|
||||
|
@ -131,7 +131,8 @@ export default {
|
|||
FFILE: []
|
||||
},
|
||||
rules: {
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
|
||||
NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
|
||||
FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -305,6 +306,10 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message({
|
||||
message: '批量删除成功',
|
||||
type: 'success'
|
||||
})
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -44,6 +44,7 @@ export default {
|
|||
this.heirloom = JSON.stringify(e)
|
||||
},
|
||||
beforeClose() {
|
||||
this.visible = false
|
||||
},
|
||||
sendMessage(row) {
|
||||
if (!this.value || this.value === '') {
|
||||
|
|
|
@ -301,10 +301,12 @@ export default {
|
|||
},
|
||||
handleClose() {
|
||||
this.visible = false
|
||||
this.form = {}
|
||||
this.$emit('refresh', '')
|
||||
},
|
||||
closeWindow() {
|
||||
this.visible = false
|
||||
this.form = {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -154,6 +154,7 @@
|
|||
<el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
|
||||
<el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
|
||||
<el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
|
||||
<el-table-column prop="TRAINING_HOURS" label="培训学时" align="center"/>
|
||||
<el-table-column label="培训有效期" align="center">
|
||||
<template slot-scope="{row}">
|
||||
<span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
|
||||
|
|
|
@ -141,7 +141,6 @@ export default {
|
|||
'/trainingbatch/userList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||
{
|
||||
KEYWORDS: this.KEYWORDS,
|
||||
STATUS: '2',
|
||||
EMPLOY_FLAG: '1',
|
||||
VALID_FLAG: '1'
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ flowTrain/batchList<template>
|
|||
<el-input v-model="XGF_NAME" placeholder="相关方名称"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-col v-if="false" :span="6">
|
||||
<el-form-item label="委托时间">
|
||||
<el-date-picker
|
||||
v-model="dates"
|
||||
|
|
Loading…
Reference in New Issue