diff --git a/src/api/expense-manage/index.js b/src/api/expense-manage/index.js
index 926bfc2..9d3d055 100644
--- a/src/api/expense-manage/index.js
+++ b/src/api/expense-manage/index.js
@@ -19,3 +19,10 @@ export const getAllocationProcess = () => {
method: "get"
});
};
+export const getAllocationDetailList = (params) => {
+ return request({
+ url: '/workflow/mosr/cost/allocation/process',
+ method: "get",
+ params:params
+ });
+};
diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index 47d95a6..f9b9ee5 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -2,16 +2,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -19,7 +9,7 @@
-
+
@@ -30,40 +20,14 @@
-
-
-
-
-
-
-
-
-
+
-
-
-
-
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index 8f7a801..16681cf 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -1,6 +1,6 @@
-
+ {{fileList}}
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 04fd904..01a5b85 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -3,7 +3,7 @@
-
+
{{ localFormData.projectName }}
@@ -19,7 +19,7 @@
- {{ formData.endTime }}
+ {{ localFormData.endTime }}
@@ -73,7 +73,9 @@
- {{ filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty) }}
+ {{
+ filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
+ }}
@@ -129,33 +131,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -252,8 +228,6 @@ const handleDownload = (row) => {
})
}
-
-
watch(() => props.processViewer, (newVal) => {
props.processViewer = newVal
}, {deep: true})
diff --git a/src/components/TagAndFileUpload.vue b/src/components/TagAndFileUpload.vue
index 56ce3c2..47a0a68 100644
--- a/src/components/TagAndFileUpload.vue
+++ b/src/components/TagAndFileUpload.vue
@@ -42,7 +42,7 @@ const props = defineProps({
},
})
const rules = reactive({
- tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
+ tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
})
const tagForm = ref()
const showTable = ref(true)
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index e372293..d45de70 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -45,6 +45,11 @@ const props = defineProps({
stepSuccess: {
type: Array,
default: ['00']
+ },
+ //直接上报/需求征集
+ reportType:{
+ type: String,
+ default: ''
}
})
@@ -238,6 +243,11 @@ getBaseInfo()
watchEffect(() => {
localActive.value = props.active
})
+watchEffect(() => {
+ if(props.reportType==='direct'){
+ localSteps.value=localSteps.value.slice(1)
+ }
+})
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index ac2ea4d..a025c92 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -8,24 +8,25 @@
-
-
-
-
-
-
-
-
+
+
+
+ 是
+ 否
+
+
+
-
-
-
+
+
+
+
@@ -33,8 +34,9 @@
@@ -46,10 +48,13 @@
@@ -243,7 +248,7 @@