diff --git a/src/api/user/user.js b/src/api/user/user.js index a8d54c2..be57ca7 100644 --- a/src/api/user/user.js +++ b/src/api/user/user.js @@ -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' }) } diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue index 40b2074..1c91b1c 100644 --- a/src/components/DetailComponent/CollectionDetail.vue +++ b/src/components/DetailComponent/CollectionDetail.vue @@ -1,9 +1,10 @@ - + diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index db9d68c..cc3a0cb 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -120,7 +120,7 @@ - + @@ -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'}] diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index 601d794..b74d541 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -213,7 +213,7 @@ const tableConfig = reactive({ }, { prop: 'economicEstimate', - label: '经济预算(元)', + label: '经费预算(元)', align: 'center', currentRender:({row})=>{ return {toThousands(row.economicEstimate)} diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 0938ac3..7cfd10e 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -229,7 +229,7 @@ const tableConfig = reactive({ }, { prop: 'economicEstimate', - label: '经济预算(元)', + label: '经费预算(元)', align: 'center', currentRender:({row})=>{ return {toThousands(row.economicEstimate)} diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index d40c7f7..ced95f4 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -211,7 +211,7 @@ const tableConfig = reactive({ }, { prop: 'economicEstimate', - label: '经济预算(元)', + label: '经费预算(元)', align: 'center', currentRender:({row})=>{ return {toThousands(row.economicEstimate)} diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue index 6aa1fd0..adc7502 100644 --- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue +++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue @@ -50,7 +50,7 @@ - + {{ toThousands(localFormData.economicEstimate) }} diff --git a/src/views/system/user/add.vue b/src/views/system/user/add.vue index f7332db..68b31a2 100644 --- a/src/views/system/user/add.vue +++ b/src/views/system/user/add.vue @@ -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 => {