diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index d011b57..3493915 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -16,6 +16,11 @@
{{ localFormData.startTime }}
+
+
+ {{ formData.endTime }}
+
+
{{ localFormData.companyName }}
@@ -132,14 +137,22 @@
+
@@ -174,7 +170,7 @@ const tableConfig = reactive({
api: '',
params: {},
btns: [
- {name: '生成分摊报表', key: '_export', color: '#DED0B2',auth: ''}
+ {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
]
})
@@ -185,11 +181,42 @@ const search = (val) => {
const handleDetail = (row) => {
router.push({
- name:'Implementation/detail',
+ name: 'Implementation/detail',
+ query: {
+ id: row.requirementId
+ }
+ })
+}
+const handleCheck = (row) => {
+ router.push({
+ name: 'Implementation/check',
+ query: {
+ id: row.requirementId
+ }
+ })
+}
+const handleStandingBook = (row) => {
+ router.push({
+ name: 'Implementation/account',
+ query: {
+ id: row.requirementId
+ }
+ })
+}
+const handleAttachment = (row) => {
+ router.push({
+ name: 'Implementation/attachment',
+ query: {
+ id: row.requirementId
+ }
+ })
+}
+const handleShare = (row) => {
+ router.push({
+ name: 'Implementation/share',
query: {
id: row.requirementId
}
})
}
-
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index c0c9c01..4ceec9d 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -8,26 +8,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
提交
@@ -35,13 +20,14 @@
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 094c11e..0b387f1 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -93,12 +93,12 @@ const tableIns = ref()
const tableConfig = reactive({
columns: [
{
- prop: 'name',
+ prop: 'projectName',
label: '名称',
align: 'center'
},
{
- prop: 'company',
+ prop: 'affiliatedCompanyId',
label: '所属公司',
align: 'center'
},
@@ -108,31 +108,32 @@ const tableConfig = reactive({
align: 'center'
},
{
- prop: 'productMainBody',
+ prop: 'rdSubject',
label: '研发主体',
align: 'center'
},
{
- prop: 'projectEffect',
+ prop: 'projectImpact',
label: '项目影响',
align: 'center'
},
{
- prop: 'survey',
- label: '经营概况',
- align: 'center'
- },
- {
- prop: 'time',
+ prop: 'startTime',
label: '起止时间',
align: 'center'
},
{
- prop: 'status',
+ prop: 'state',
label: '状态',
align: 'center',
showOverflowTooltip: false,
- currentRender: ({row, index}) => (
)
+ currentRender: ({row, index}) =>{
+ if (row.state !== null) {
+ return ()
+ } else {
+ return '--'
+ }
+ }
},
{
prop: 'oper',
@@ -143,7 +144,7 @@ const tableConfig = reactive({
let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
if (row.state === '3') {
btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
- } else if (row.state === '4') {
+ } else if (row.state === '20') {
btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
}
return (
@@ -165,7 +166,7 @@ const tableConfig = reactive({
}
}
],
- api: '/workflow/mosr/requirement',
+ api: '/workflow/mosr/project/approval',
params: {},
})