odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 修复页面细节' (#226) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/226
This commit is contained in:
odjbin
2024-05-23 12:48:45 +00:00
parent 5eb7e34571 43c9cb03d3
commit 390474ea24
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/project-demand/summary/add.vue
View File

@@ -46,12 +46,12 @@
</el-config-provider> </el-config-provider>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-form-item label="所属公司" prop="affiliatedCompanyId">-->
<el-form-item label="所属公司" prop="affiliatedCompanyId"> <!-- <el-tree-select v-model="formData.affiliatedCompanyId" :data="companyOption" style="width: 100%;"-->
<el-tree-select v-model="formData.affiliatedCompanyId" :data="companyOption" style="width: 100%;" <!-- filterable clearable :check-strictly="true"/>-->
filterable clearable :check-strictly="true" multiple/> <!-- </el-form-item>-->
</el-form-item> <!-- </el-col> <el-col :span="12">-->
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="项目类型" prop="projectType"> <el-form-item label="项目类型" prop="projectType">
<el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable> <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
@@ -263,7 +263,7 @@ const rules = reactive({
specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}], specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}], startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
rdSubject: [{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'}], projectType: [{required: true, message: '请选择项目类型', trigger: 'blur'}],
endTime: [{required: true, message: '请选择结束时间', trigger: 'blur'}], endTime: [{required: true, message: '请选择结束时间', trigger: 'blur'}],
investmentType: [{required: true, message: '请选择出资类型', trigger: 'blur'}], investmentType: [{required: true, message: '请选择出资类型', trigger: 'blur'}],
@@ -359,7 +359,7 @@ const handleSubmit = async (instance) => {
"resultForm": "3", "resultForm": "3",
"projectImpact": "3", "projectImpact": "3",
"rdSubject": "3", "rdSubject": "3",
"affiliatedCompanyId": formData.value.affiliatedCompanyId, // "affiliatedCompanyId": formData.value.affiliatedCompanyId,
"serviceDescription": "3", "serviceDescription": "3",
"contentDescription": "3", "contentDescription": "3",
"specialFundAmount": "3", "specialFundAmount": "3",

4
src/views/project-demand/summary/index.vue
View File

@@ -123,7 +123,7 @@ const tableConfig = reactive({
currentRender: ({row, index}) => { currentRender: ({row, index}) => {
let btn = [] let btn = []
let buttons = new Set(Array.from(row.buttons)) 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'}) btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
} }
if (buttons.has("edit")) { if (buttons.has("edit")) {
@@ -132,7 +132,7 @@ const tableConfig = reactive({
// if (buttons.has("delete")) { // if (buttons.has("delete")) {
// btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleEdit(row), type: 'primary'}) // 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'}) btn.push({label: '上报',prem: ['mosr:collect:reported'], func: () => handleAdd(row), type: 'primary'})
} }
return ( return (