feat : 需求上报和详情新增是否在预算内字段

This commit is contained in:
2024-10-24 22:04:46 +08:00
parent c2c1cfd6e1
commit a8feed2d7f
2 changed files with 20 additions and 30 deletions

View File

@@ -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(() => {
</div>
)
},
// {
// label: '是否专项资金项目',
// prop: 'isSpecialFund',
// colProps: {
// span: 6
// }
// },
{
label: '所属专项资金',
prop: 'specialFund',
@@ -377,6 +349,13 @@ const schema = computed(() => {
</div>
)
},
{
label: '是否在预算内',
prop: 'isWithinBudget',
colProps: {
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
@@ -393,7 +372,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 => {

View File

@@ -184,7 +184,15 @@
<!-- <el-input-number v-model="formData.specialFundAmount" placeholder="请输入申请总部专项资金" :controls="false"/>-->
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
<el-form-item label="是否在预算内" prop="isWithinBudget" required >
<el-select v-model="formData.isWithinBudget" clearable placeholder="请选择是否在预算内">
<el-option label="是" :value="true"/>
<el-option label="否" :value="false"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':'0'}">
<el-form-item label="部门分管领导" prop="">
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
{{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
@@ -197,6 +205,7 @@
v-model:value="optionalChargeLeadershipList" @ok="optionalChargeLeaderPickerOkOrCancel"/>
</el-form-item>
</el-col>
</el-row>
<baseTitle title="预期知识产权"></baseTitle>
<el-row gutter="30" style="margin-bottom: -18px;"
@@ -352,6 +361,7 @@ const showSingleTable = ref(false)
const otherFileList = ref([])
const singleList = ref([])
const formData = ref({
isWithinBudget: false,
isSpecialFund: false,
industryUniversityResearch: '1',
governmentDeclaration: '1',
@@ -380,6 +390,7 @@ const rules = reactive({
other: [{required: true, message: '请输入其他数量', trigger: ['blur', 'change']}],
economicEstimate: [{required: true, message: '请输入经费预算', trigger: ['blur', 'change']}],
isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}],
isWithinBudget: [{required: true, message: '请选择是否在预算内', trigger: ['blur', 'change']}],
specialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}],
serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: ['blur', 'change']}],
contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: ['blur', 'change']}]