diff --git a/src/api/flowManagement/index.js b/src/api/flowManagement/index.js
index dd111aa..5a9bc1f 100644
--- a/src/api/flowManagement/index.js
+++ b/src/api/flowManagement/index.js
@@ -22,3 +22,75 @@ export const addProcess = (data) => {
data
});
}
+
+// 删除
+export const delProcess = (data) => {
+ return request({
+ url: '/blade-desk/fmProjectApplication/remove',
+ method: 'post',
+ params:data
+ });
+}
+
+// 修改
+export const updateProcess = (data) => {
+ return request({
+ url: '/blade-desk/fmProjectApplication/update',
+ method: 'post',
+ data
+ });
+}
+
+// 查看详情
+export const getProcessDetail = (id) => {
+ return request({
+ url: '/blade-desk/fmProjectApplication/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ });
+}
+// 导出数据
+
+export const exportfmProjectMilestone = (params) => {
+ return request({
+ url: '/blade-desk/fmProjectApplication/export-fmProjectApplication',
+ method: 'get',
+ params: params
+ });
+}
+
+
+
+
+
+
+
+// 执行
+export const projectExecute = (data) => {
+ return request({
+ url: '/blade-desk/fmProjectMilestone/projectExecute',
+ method: 'post',
+ data
+ });
+}
+
+// 核查
+export const projectCheck = (data) => {
+ return request({
+ url: '/blade-desk/fmProjectMilestone/sendCheck',
+ method: 'post',
+ data
+ });
+}
+
+// 核准
+export const projectApprove = (data) => {
+ return request({
+ url: '/blade-desk/fmProjectMilestone/gradeSubmit',
+ method: 'post',
+ data
+ });
+}
+
diff --git a/src/views/changeJobManagement/trainingRecordManagement.vue b/src/views/changeJobManagement/trainingRecordManagement.vue
index 79d0416..e4baac7 100644
--- a/src/views/changeJobManagement/trainingRecordManagement.vue
+++ b/src/views/changeJobManagement/trainingRecordManagement.vue
@@ -8,7 +8,6 @@
v-model="form"
v-model:page="page"
ref="crud"
- @row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -29,7 +28,7 @@
>
培训详情
@@ -49,17 +48,24 @@
>完成
-
+
{{ scope.row.distributeTime ? scope.row.distributeTime.substring(0, 10) : '' }}
-
+
+
@@ -72,7 +78,7 @@
- 资料下载
+ 资料下载
@@ -167,14 +173,16 @@ export default {
label: '资料上传',
prop: 'excelFile',
type: 'upload',
- drag: true,
+ // drag: true,
loadText: '附件上传中，请稍等',
span: 24,
+ limit: 1,
+ fileSize: 10000,
propsHttp: {
res: 'data',
},
tip: '不能上传 附件，且不超过 10M',
- action: '/blade-system/user/import-user',
+ action: '/api/blade-resource/oss/endpoint/put-file-attach',
},
],
},
@@ -334,13 +342,17 @@ export default {
},
uploadInfo: {},
rowData: {},
+ attachLink:''
};
},
mounted() {
- this.getPlanList()
- this.getUserList()
+ this.getPlanList();
+ this.getUserList();
},
methods: {
+ downloadFile(link) {
+ window.open(link);
+ },
// 修改配置
handleUpdate(row) {
this.rowData = row;
@@ -356,7 +368,7 @@ export default {
this.teacherArr = res.data.data.records;
});
},
- // 切换培训师
+ // 切换培训师
changeTeacher(val) {
let select = this.teacherArr.find(e => e.id == val);
this.formModel.teacherName = select.realName;
@@ -379,6 +391,9 @@ export default {
}
});
},
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
searchReset() {
this.query = {};
this.onLoad(this.page, this.query);
@@ -444,8 +459,21 @@ export default {
});
}
},
+ uploadAfter(res, done, loading, column) {
+ console.log('uploadAfter', res, done, loading, column);
+ this.attachLink = res.link;
+ // this.fileForm.excelFile = [res.link];
+ // done();
+ },
+ uploadDelete(file, column) {
+ // this.fileForm.excelFile = [];
+ },
+ uploadExceed(limit, files, fileList, column) {
+ this.$message.error('最多只能上传一个文件');
+ },
// 批量上传
handleUpload(type, row) {
+ this.fileForm.excelFile = [];
if (type == 'all') {
if (this.selectionList.length == 0) {
this.$message.error('请至少选择一条数据');
@@ -465,10 +493,10 @@ export default {
},
// 批量上传数据
submitUpload() {
- console.log(this.fileForm, 'fileForm');
+ console.log(this.fileForm,this.attachLink , 'fileForm');
if (this.selectionList.length > 0) {
this.selectionList.forEach(item => {
- item.attachLink = '';
+ item.attachLink = this.attachLink ;
});
uploadMaterials(this.selectionList).then(res => {
this.$message.success('上传成功');
@@ -478,7 +506,7 @@ export default {
});
} else {
this.uploadInfo.forEach(item => {
- this.fileForm.attachLink = '';
+ this.fileForm.attachLink = this.attachLink ;
});
uploadMaterials(this.uploadInfo).then(res => {
this.$message.success('上传成功');
diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue
index 2a60284..337c611 100644
--- a/src/views/flowManagement/addDialog.vue
+++ b/src/views/flowManagement/addDialog.vue
@@ -1,428 +1,555 @@
-
-
-
-
-
-
- {{ formError }}
-
+
+
+
+
+
+ {{ formError }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 插入一行
-
+
+
+ 插入一行
+ 删除选中行
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.milestonePlan }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.milestoneMan }}
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.outputMaterial }}
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.milestoneNode }}
-
-
-
-
-
-
-
-
-
-
-
-
- 附件
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.milestonePlan }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.milestoneMan }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.outputMaterial }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.milestoneNode }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
+.el-table__cell {
+ vertical-align: middle !important;
+}
+
+.error-message {
+ font-size: 14px;
+ line-height: 1.5;
+}
+:deep(.el-table .el-table__cell) {
+ height: 50px !important;
+ padding: 0 !important;
+ line-height: 50px !important;
+}
+
+
diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue
index 5788310..55b5809 100644
--- a/src/views/flowManagement/managementOfKeyTasks.vue
+++ b/src/views/flowManagement/managementOfKeyTasks.vue
@@ -1,11 +1,24 @@
-
+
- 新增
+ 新增
详情
@@ -20,41 +33,77 @@
-
-
-
-
+
+
+
+
-
+
- 执行
- 核查
- 核准
+ 执行
+ 核查
+ 核准
-
+
-
+
-
-
-
-
-
-
-
+
+ 通过
+ 不通过
+
@@ -92,32 +141,60 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
点击上传
不能上传 exe 附件，且不超过 20M
@@ -126,7 +203,9 @@
@@ -160,7 +239,11 @@
-
+
@@ -174,7 +257,7 @@