diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index b4c82e8..f8dc544 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -153,27 +153,6 @@ const baseForm = ref() const baseFormData = ref([]) const schema = computed(() => { return [ - // { - // label: '征集公司', - // prop: 'affiliatedCompany', - // colProps: { - // span: 6 - // } - // }, - // { - // label: '征集名称', - // prop: 'requirementName', - // colProps: { - // span: 6 - // } - // }, - // { - // label: '征集说明', - // prop: 'collectExplain', - // colProps: { - // span: 24 - // } - // }, { label: '承办单位', prop: 'affiliatedCompany', @@ -347,13 +326,6 @@ const schema = computed(() => { ) }, - // { - // label: '是否专项资金项目', - // prop: 'isSpecialFund', - // colProps: { - // span: 6 - // } - // }, { label: '所属专项资金', prop: 'specialFund', @@ -377,6 +349,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', @@ -393,7 +381,7 @@ const handlePrint = (print) => { } // 格式化详情步骤条 const formatProcedure = (data) => { - console.info("🚀 ~method:formatProcedure -----", data) + // console.info("🚀 ~method:formatProcedure -----", data) let arr = [] if (data instanceof Array) { data.forEach(item => { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 1f099ff..ffb3aa4 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -184,7 +184,15 @@ - + + + + + + + + + {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }} @@ -197,6 +205,7 @@ v-model:value="optionalChargeLeadershipList" @ok="optionalChargeLeaderPickerOkOrCancel"/> + { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', @@ -242,6 +258,10 @@ const schema = computed(() => { const baseForm = ref() const paneList = ref([ + { + label: '全部', + name: '111' + }, { label: '需求征集', name: '00' @@ -353,7 +373,9 @@ const upload = () => { } watchEffect(() => { if (requirementId.value === '-1') { - paneList.value = paneList.value.slice(1) + console.info("🚀 ~method: -----", paneList.value.filter(item=>item.name!=='00')) + paneList.value = paneList.value.filter(item=>item.name!=='00') + } }) search({}) diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue index 8586118..1f2da2a 100644 --- a/src/views/project-management/filing/upload.vue +++ b/src/views/project-management/filing/upload.vue @@ -238,6 +238,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index df7a35b..003e941 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -233,6 +233,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + basicData.value?.isWithinBudget!=null ? basicData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue index 7cf0c41..466f3d7 100644 --- a/src/views/project-management/implementation/attachment.vue +++ b/src/views/project-management/implementation/attachment.vue @@ -247,6 +247,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue index fa34678..969cc80 100644 --- a/src/views/project-management/implementation/phaseDetail.vue +++ b/src/views/project-management/implementation/phaseDetail.vue @@ -234,6 +234,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue index 27d73a8..5b5856d 100644 --- a/src/views/project-management/implementation/share.vue +++ b/src/views/project-management/implementation/share.vue @@ -215,6 +215,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue index b864d3b..9914e30 100644 --- a/src/views/project-management/implementation/upload.vue +++ b/src/views/project-management/implementation/upload.vue @@ -252,6 +252,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership', diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index 7bd830b..8ef07cc 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -330,6 +330,22 @@ const schema = computed(() => { ) }, + { + label: '是否在预算内', + prop: 'isWithinBudget', + colProps: { + span: 6 + }, + component: () => ( +
+ { + baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget? + {'预算内'} + : {'预算外'}:'--' + } +
+ ) + }, { label: '部门分管领导', prop: 'optionalChargeLeadership',