diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index c75fd9a..4f36ca3 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -46,12 +46,12 @@ - - - - - + + + + + + @@ -263,7 +263,7 @@ const rules = reactive({ specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}], startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}], rdSubject: [{required: true, message: '请输入研发主体', trigger: 'blur'}], - affiliatedCompanyId: [{required: true, message: '请输入所属公司', trigger: 'blur'}], + // affiliatedCompanyId: [{required: true, message: '请输入所属公司', trigger: 'blur'}], projectType: [{required: true, message: '请选择项目类型', trigger: 'blur'}], endTime: [{required: true, message: '请选择结束时间', trigger: 'blur'}], investmentType: [{required: true, message: '请选择出资类型', trigger: 'blur'}], @@ -359,7 +359,7 @@ const handleSubmit = async (instance) => { "resultForm": "3", "projectImpact": "3", "rdSubject": "3", - "affiliatedCompanyId": formData.value.affiliatedCompanyId, + // "affiliatedCompanyId": formData.value.affiliatedCompanyId, "serviceDescription": "3", "contentDescription": "3", "specialFundAmount": "3", diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 9d8dfac..04a6db5 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -123,7 +123,7 @@ const tableConfig = reactive({ currentRender: ({row, index}) => { let btn = [] let buttons = new Set(Array.from(row.buttons)) - if (buttons.has("detail")) { + if (buttons.has("details")) { btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'}) } if (buttons.has("edit")) { @@ -132,7 +132,7 @@ const tableConfig = reactive({ // if (buttons.has("delete")) { // btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleEdit(row), type: 'primary'}) // } - if (buttons.has("reported")) { + if (buttons.has("report")) { btn.push({label: '上报',prem: ['mosr:collect:reported'], func: () => handleAdd(row), type: 'primary'}) } return (