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

Merge pull request 'dd' (#666) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/666
This commit is contained in:
odjbin
2024-08-05 09:26:35 +00:00
parent 848f167bb6 147d66c756
commit ebccaaa12f
10 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/user/user.js
View File

@@ -21,9 +21,9 @@ export const getUserAccount = () => {
method: 'get'
})
}
export const judgeIsSameRole = () => {
export const judgeIsSameRole = (userId) => {
return request({
url: '/admin/mosr/user/company/same',
url: `/admin/mosr/user/company/same/${userId}`,
method: 'get'
})
}

7
src/components/DetailComponent/CollectionDetail.vue
View File

@@ -1,9 +1,10 @@
<template>
<div v-loading="loading">
<baseTitle title="需求征集信息" v-if="type!=='singleDetail'"></baseTitle>
<el-form :model="formData">
<el-row>
<el-col :span="6" v-if="type==='singleDetail'">
<el-form :model="formData" >
<el-row gutter="20">
<!-- v-if="type==='singleDetail'"-->
<el-col :span="6">
<el-form-item label="征集名称">
<span>{{ formData.requirementName }}</span>
</el-form-item>

16
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -2,7 +2,7 @@
<div class="detail-block" v-loading="loading">
<baseTitle title="需求上报信息"></baseTitle>
<el-form :model="localFormData" ref="summaryForm" :rules="rules">
<el-row gutter="14" style="margin-bottom: -18px">
<el-row gutter="20" style="margin-bottom: -18px">
<el-col :span="6">
<el-form-item label="项目名称" prop="projectName">
<span>{{ localFormData.projectName }}</span>
@@ -40,7 +40,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预期技术标准制定" prop="technicalStandard">
<el-form-item label="标准制定" prop="technicalStandard">
<span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
</el-form-item>
</el-col>
@@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="经济预算(元)" prop="economicEstimate">
<el-form-item label="经费预算(元)" prop="economicEstimate">
<span>{{ toThousands(localFormData.economicEstimate) }}</span>
</el-form-item>
</el-col>
@@ -69,24 +69,24 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="localFormData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFund">
<el-form-item label="所属专项资金项目" prop="specialFund">
<span>{{
localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
}}</span>
</el-form-item>
</el-col>
<el-col :span="6" v-if="localFormData.isSpecialFund">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
<el-form-item label="申请总部专项资金(元)" prop="specialFundAmount">
<span>{{ toThousands(localFormData.specialFundAmount) }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="部门分管领导" prop="optionalChargeLeadership">
<span>{{ localFormData.optionalChargeLeadership?.map(item=>item.name).join() }}</span>
<span>{{ localFormData.optionalChargeLeadership?.map(item=>item.name).join()||'--' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="14" style="margin-bottom: -18px">
<el-row gutter="20" style="margin-bottom: -18px">
<el-col :span="24">
<baseTitle title="预期知识产权"></baseTitle>
</el-col>
@@ -128,7 +128,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row gutter="14" >
<el-row gutter="20" >
<el-col :span="24">
<baseTitle title="项目描述"></baseTitle>
</el-col>

2
src/views/plan/detail.vue
View File

@@ -130,7 +130,7 @@
<div v-else>--</div>
</template>
</el-table-column>
<el-table-column prop="intellectualProperty" label="经济预算(元)" align="center">
<el-table-column prop="intellectualProperty" label="经费预算(元)" align="center">
<template #default="scope">
<span>{{ toThousands(scope.row.economicEstimate) }}</span>
</template>

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

@@ -120,7 +120,7 @@
<!-- <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">-->
<el-col :span="6">
<el-form-item label="经费预算" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经费预算数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -374,7 +374,7 @@ const rules = reactive({
softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}],
copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
other: [{required: true, message: '请输入其他', trigger: 'blur'}],
economicEstimate: [{required: true, message: '请输入经济预算', trigger: 'blur'}],
economicEstimate: [{required: true, message: '请输入经费预算', trigger: 'blur'}],
specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]

2
src/views/project-management/filing/index.vue
View File

@@ -213,7 +213,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经济预算(元)',
label: '经费预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>

2
src/views/project-management/implementation/index.vue
View File

@@ -229,7 +229,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经济预算(元)',
label: '经费预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>

2
src/views/project-management/initiation/index.vue
View File

@@ -211,7 +211,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经济预算(元)',
label: '经费预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>

2
src/views/project-management/mobledetail/SummaryDetailMoblie.vue
View File

@@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="经济预算(元)" prop="economicEstimate">
<el-form-item label="经费预算(元)" prop="economicEstimate">
<span>{{ toThousands(localFormData.economicEstimate) }}</span>
</el-form-item>
</el-col>

4
src/views/system/user/add.vue
View File

@@ -122,9 +122,9 @@ const schame = computed(() => {
},
on: {
change: async (val) => {
const {code, data} = await judgeIsSameRole()
const {code, data} = await judgeIsSameRole(form.value.getValues().userId)
if (code === 1000) {
console.log('currentRoleArray.value', currentRoleArray.value)
console.log('currentRoleArray.value',data)
if (currentRoleArray.value.length !== 0) {
val.forEach(selectItem => {
currentRoleArray.value.forEach(currentItem => {