diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue
index eb79bbc..4cf79d8 100644
--- a/src/components/NameCircle.vue
+++ b/src/components/NameCircle.vue
@@ -15,7 +15,7 @@
{{user.operationTime}}
-
+
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index 9b632ff..46c3d17 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -250,7 +250,7 @@ const handleSubmit = async (instance) => {
})
}
const handleResubmit = () => {
- resubmit(submitParam()).then(res => {
+ resubmit(submitParam(formData.value)).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
diff --git a/src/views/project-demand/collection/index.vue b/src/views/project-demand/collection/index.vue
index a8ede61..1957aa4 100644
--- a/src/views/project-demand/collection/index.vue
+++ b/src/views/project-demand/collection/index.vue
@@ -87,8 +87,6 @@ const tableConfig = reactive({
let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
if (row.state === '3' || row.state === '2') {
btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
- } else if (row.state === '4') {
- btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
}
return (
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 6ab76ad..52f8b6c 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -34,8 +34,8 @@
-
-
+
+
@@ -50,6 +50,11 @@
+
+
+
+
+
@@ -315,7 +320,8 @@ const handleSubmit = async (instance) => {
let params = {
...formData.value,
deploymentId: deploymentId.value,
- files: files
+ files: files,
+ requirementId:102
}
let res = await requirementReported(params)
ElNotification({
diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js
index a0c5b30..98ea624 100644
--- a/src/views/project-demand/summary/api/index.js
+++ b/src/views/project-demand/summary/api/index.js
@@ -24,3 +24,9 @@ export const getProcessInfo = () => {
method: "post"
});
};
+export const getDetail = (requirementId) => {
+ return request({
+ url: `/workflow/mosr/requirement/collect/info/${requirementId}`,
+ method: "get"
+ });
+};
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 30d4f0e..a8ef96f 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -3,17 +3,17 @@