Merge branch 'developer' into 'master'

Developer

See merge request scj/zhxy/v3/cloud-ui!4
This commit is contained in:
Administrator
2026-03-08 17:35:50 +00:00

View File

@@ -312,12 +312,12 @@ upload-file-url="/purchase/purchasingfiles/upload"
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="mb12" v-if="showAutoInviteSelect && dataForm.hasSupplier === '1'"> <el-col :span="8" class="mb12" v-if="showAutoInviteSelect && dataForm.hasSupplier === '1'">
<el-form-item label="服务商城项目需求模板(邀请比选)" prop="serviceInviteSelect" required> <el-form-item label="服务商城项目需求模板(邀请比选)" prop="serviceInviteSelect" required>
<upload-file <upload-file
v-model="dataForm.serviceInviteSelect" v-model="dataForm.serviceInviteSelect"
:limit="1" :limit="1"
:file-type="[ 'pdf', 'jpg', 'jpeg', 'png']" :file-type="['doc', 'docx']"
:data="{ fileType: FILE_TYPE_MAP.serviceInviteSelect }" :data="{ fileType: FILE_TYPE_MAP.serviceInviteSelect }"
upload-file-url="/purchase/purchasingfiles/upload" upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('serviceInviteSelect')" :disabled="flowFieldDisabled('serviceInviteSelect')"
@@ -333,12 +333,12 @@ upload-file-url="/purchase/purchasingfiles/upload"
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="mb12" v-if="showAutoInviteSelect && dataForm.hasSupplier === '0'"> <el-col :span="8" class="mb12" v-if="showAutoInviteSelect && dataForm.hasSupplier === '0'">
<el-form-item label="服务商城项目需求模板(公开比选)" prop="servicePublicSelectAuto" required> <el-form-item label="服务商城项目需求模板(公开比选)" prop="servicePublicSelectAuto" required>
<upload-file <upload-file
v-model="dataForm.servicePublicSelectAuto" v-model="dataForm.servicePublicSelectAuto"
:limit="1" :limit="1"
:file-type="[ 'pdf', 'jpg', 'jpeg', 'png']" :file-type="['doc', 'docx']"
:data="{ fileType: FILE_TYPE_MAP.servicePublicSelectAuto }" :data="{ fileType: FILE_TYPE_MAP.servicePublicSelectAuto }"
upload-file-url="/purchase/purchasingfiles/upload" upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('servicePublicSelectAuto')" :disabled="flowFieldDisabled('servicePublicSelectAuto')"
@@ -584,7 +584,7 @@ upload-file-url="/purchase/purchasingfiles/upload"
<upload-file <upload-file
v-model="dataForm.serviceInviteSelectSchool" v-model="dataForm.serviceInviteSelectSchool"
:limit="1" :limit="1"
:file-type="[ 'doc', 'docx']" :file-type="['doc', 'docx']"
:data="{ fileType: FILE_TYPE_MAP.serviceInviteSelectSchool }" :data="{ fileType: FILE_TYPE_MAP.serviceInviteSelectSchool }"
upload-file-url="/purchase/purchasingfiles/upload" upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('serviceInviteSelectSchool')" :disabled="flowFieldDisabled('serviceInviteSelectSchool')"
@@ -599,11 +599,11 @@ upload-file-url="/purchase/purchasingfiles/upload"
>下载《{{ getTemplateName('invite_select') }}》模版 >下载《{{ getTemplateName('invite_select') }}》模版
</el-button> </el-button>
</template> </template>
<template v-else-if="dataForm.hasSupplier === '0'"> <template v-else-if="dataForm.hasSupplier === '0'">
<upload-file <upload-file
v-model="dataForm.servicePublicSelectSchoolAuto" v-model="dataForm.servicePublicSelectSchoolAuto"
:limit="1" :limit="1"
:file-type="[ 'pdf', 'jpg', 'jpeg', 'png']" :file-type="['doc', 'docx']"
:data="{ fileType: FILE_TYPE_MAP.servicePublicSelectSchoolAuto }" :data="{ fileType: FILE_TYPE_MAP.servicePublicSelectSchoolAuto }"
upload-file-url="/purchase/purchasingfiles/upload" upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('servicePublicSelectSchoolAuto')" :disabled="flowFieldDisabled('servicePublicSelectSchoolAuto')"
@@ -619,11 +619,11 @@ upload-file-url="/purchase/purchasingfiles/upload"
</el-button> </el-button>
</template> </template>
</template> </template>
<template v-else-if="showAutoPublicSelect"> <template v-else-if="showAutoPublicSelect">
<upload-file <upload-file
v-model="dataForm.servicePublicSelectSchool" v-model="dataForm.servicePublicSelectSchool"
:limit="1" :limit="1"
:file-type="[ 'pdf', 'jpg', 'jpeg', 'png']" :file-type="['doc', 'docx']"
:data="{ fileType: FILE_TYPE_MAP.servicePublicSelectSchool }" :data="{ fileType: FILE_TYPE_MAP.servicePublicSelectSchool }"
upload-file-url="/purchase/purchasingfiles/upload" upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('servicePublicSelectSchool')" :disabled="flowFieldDisabled('servicePublicSelectSchool')"
@@ -638,11 +638,11 @@ upload-file-url="/purchase/purchasingfiles/upload"
>下载《{{ getTemplateName('public_select') }}》模版 >下载《{{ getTemplateName('public_select') }}》模版
</el-button> </el-button>
</template> </template>
<template v-else> <template v-else>
<upload-file <upload-file
v-model="dataForm.purchaseRequirement" v-model="dataForm.purchaseRequirement"
:limit="1" :limit="1"
:file-type="[ 'pdf', 'jpg', 'jpeg', 'png']" :file-type="['doc', 'docx']"
:data="{ fileType: FILE_TYPE_MAP.purchaseRequirement }" :data="{ fileType: FILE_TYPE_MAP.purchaseRequirement }"
upload-file-url="/purchase/purchasingfiles/upload" upload-file-url="/purchase/purchasingfiles/upload"
:disabled="flowFieldDisabled('purchaseRequirement')" :disabled="flowFieldDisabled('purchaseRequirement')"