feat(project-demand): 更新项目需求汇总功能
- 新增 getProjectName 方法,用于项目名称关键词匹配- 修改远程搜索方法,使用 getProjectName 替代 getRequirementName - 更新 ProjectApply 组件,调整专项资金输入框显示逻辑 - 移除 proxy 配置中的注释
This commit is contained in:
@@ -25,6 +25,16 @@ export const getRequirementName = (requirementName) => {
|
|||||||
method: "get"
|
method: "get"
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
//需求汇总-项目名称关键词匹配
|
||||||
|
export const getProjectName = (projectName) => {
|
||||||
|
return request({
|
||||||
|
url: `workflow/mosr/requirement/collect`,
|
||||||
|
method: "get",
|
||||||
|
params:{
|
||||||
|
projectName:projectName
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
//获取需求上报 流程信息
|
//获取需求上报 流程信息
|
||||||
export const getProcessInfo = (specialFund) => {
|
export const getProcessInfo = (specialFund) => {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@@ -10,8 +10,8 @@
|
|||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6" >
|
<el-col :span="6" v-if="isSpecialFund">
|
||||||
<!-- label-width="106" v-if="isSpecialFund"-->
|
<!-- label-width="106" -->
|
||||||
<el-form-item label="实际专项资金(元)" prop="specialFundAmount" label-width="140">
|
<el-form-item label="实际专项资金(元)" prop="specialFundAmount" label-width="140">
|
||||||
<el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
|
<el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
|
||||||
</el-input>
|
</el-input>
|
||||||
@@ -782,7 +782,7 @@ const handleSubmit = async (instance) => {
|
|||||||
params.projectPersonIds = projectPersonIds
|
params.projectPersonIds = projectPersonIds
|
||||||
params.optionalChargeLeadership = optionalChargeLeadershipList.value
|
params.optionalChargeLeadership = optionalChargeLeadershipList.value
|
||||||
if (props.mode === 'resubmit') {
|
if (props.mode === 'resubmit') {
|
||||||
res = await resubmitApply(params)
|
// res = await resubmitApply(params)
|
||||||
} else {
|
} else {
|
||||||
res = await projectApply(params)
|
res = await projectApply(params)
|
||||||
}
|
}
|
||||||
@@ -831,7 +831,7 @@ const init = async () => {
|
|||||||
deploymentId.value = data.deploymentId
|
deploymentId.value = data.deploymentId
|
||||||
deploymentData.value = data
|
deploymentData.value = data
|
||||||
console.log('data,',data)
|
console.log('data,',data)
|
||||||
preProcessRequired.value = data.deploymentName === '重大项目立项' || data.deploymentName === '重大项目验收';
|
// preProcessRequired.value = data.deploymentName === '重大项目立项' || data.deploymentName === '重大项目验收';
|
||||||
processStore.setDesign(data)
|
processStore.setDesign(data)
|
||||||
processStore.runningList.value = data.runningList;
|
processStore.runningList.value = data.runningList;
|
||||||
processStore.endList.value = data.endList;
|
processStore.endList.value = data.endList;
|
||||||
@@ -867,7 +867,7 @@ watchEffect(() => {
|
|||||||
// if (props.formData.projectChargePerson != null) {
|
// if (props.formData.projectChargePerson != null) {
|
||||||
// localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
|
// localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
|
||||||
// }
|
// }
|
||||||
|
console.log('localFormData.value',localFormData.value)
|
||||||
if (localStorage.getItem('preProcess')) {
|
if (localStorage.getItem('preProcess')) {
|
||||||
let param = JSON.parse(localStorage.getItem('preProcess'))
|
let param = JSON.parse(localStorage.getItem('preProcess'))
|
||||||
localFormData.value.preProcess = param
|
localFormData.value.preProcess = param
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<script setup lang="jsx">
|
<script setup lang="jsx">
|
||||||
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
|
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
|
||||||
import {addPlan, getRequirementName} from "@/api/project-demand/summary";
|
import {addPlan, getProjectName, getRequirementName} from "@/api/project-demand/summary";
|
||||||
import {getSubCompOpt} from "@/api/user/user";
|
import {getSubCompOpt} from "@/api/user/user";
|
||||||
import {filterRequirementName} from "@/api/project-demand";
|
import {filterRequirementName} from "@/api/project-demand";
|
||||||
|
|
||||||
@@ -84,14 +84,14 @@ const searchConfig = ref([
|
|||||||
remote: true,
|
remote: true,
|
||||||
remoteMethod:async (val)=>{
|
remoteMethod:async (val)=>{
|
||||||
if(val){
|
if(val){
|
||||||
const res=await getRequirementName(val)
|
const res=await getProjectName(val)
|
||||||
if(res.code==1000){
|
if(res.code==1000){
|
||||||
let optionObj={}
|
let optionObj={}
|
||||||
let optionsMap = new Map();
|
let optionsMap = new Map();
|
||||||
res.data.forEach(item=>{
|
res.data.rows.forEach(item=>{
|
||||||
optionObj={
|
optionObj={
|
||||||
value:item,
|
value:item.projectName,
|
||||||
label:item
|
label:item.projectName
|
||||||
}
|
}
|
||||||
optionsMap.set(optionObj.value, optionObj);
|
optionsMap.set(optionObj.value, optionObj);
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user