Merge branch 'developer'

This commit is contained in:
吴红兵
2026-03-11 11:04:56 +08:00

View File

@@ -512,7 +512,7 @@
</el-button>
</el-form-item>
</el-col>
<el-col :span="8" class="mb12" v-if="dataForm.budget && dataForm.budget >= BUDGET_FEASIBILITY_THRESHOLD && isSpecialType('0')">
<el-col :span="8" class="mb12" v-if="(dataForm.budget && dataForm.budget >= BUDGET_FEASIBILITY_THRESHOLD ) || !isSpecialType('0')">
<el-form-item label="校党委会议纪要" prop="meetingMinutes" required>
<upload-file
v-model="dataForm.meetingMinutes"
@@ -546,18 +546,7 @@
</el-button>
</el-form-item>
</el-col>
<el-col :span="8" class="mb12" v-if="isSpecialType('2')">
<el-form-item label="校党委会议纪要" prop="meetingMinutesSingle" required>
<upload-file
v-model="dataForm.meetingMinutesSingle"
:limit="1"
:file-type="['pdf', 'jpg', 'jpeg', 'png']"
:data="{ fileType: FILE_TYPE_MAP.meetingMinutesSingle }"
upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('meetingMinutesSingle')"
/>
</el-form-item>
</el-col>
<el-col :span="8" class="mb12" v-if="isSpecialType('3')">
<el-form-item label="进口产品申请及专家论证意见表" prop="importApplication" required>
<upload-file
@@ -579,18 +568,7 @@
</el-button>
</el-form-item>
</el-col>
<el-col :span="8" class="mb12" v-if="isSpecialType('3')">
<el-form-item label="校党委会议纪要" prop="meetingMinutesImport" required>
<upload-file
v-model="dataForm.meetingMinutesImport"
:limit="1"
:file-type="['pdf', 'jpg', 'jpeg', 'png']"
:data="{ fileType: FILE_TYPE_MAP.meetingMinutesImport }"
upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('meetingMinutesImport')"
/>
</el-form-item>
</el-col>
<el-col :span="8" class="mb12" v-if="showAutoInviteSelectSchool">
<el-form-item label="是否有推荐供应商" prop="hasSupplier">
<el-radio-group v-model="dataForm.hasSupplier" :disabled="flowFieldDisabled('hasSupplier')">