Merge remote-tracking branch 'origin/feature_职代会' into feature_职代会

This commit is contained in:
2026-07-31 11:06:59 +08:00
@@ -83,7 +83,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in materialOptions" :key="item.id" <el-option v-for="item in materialOptions" :key="item.id"
:label="item.name" :value="item.id"></el-option> :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
<el-upload action="/platform/sys/file/uploadDynamicReturnUrl" :show-file-list="false" <!--<el-upload action="/platform/sys/file/uploadDynamicReturnUrl" :show-file-list="false"
style="width:180px; flex:0 0 180px;" style="width:180px; flex:0 0 180px;"
:disabled="materialUploadDisabled || materialUploadLoading" :disabled="materialUploadDisabled || materialUploadLoading"
:before-upload="beforeMaterialUpload" :before-upload="beforeMaterialUpload"
@@ -93,7 +93,7 @@ layout("/layouts/platform.html"){
<el-button type="primary" icon="el-icon-upload" style="width:180px" <el-button type="primary" icon="el-icon-upload" style="width:180px"
:loading="materialUploadLoading" :loading="materialUploadLoading"
:disabled="materialUploadDisabled || materialUploadLoading">上传资料</el-button> :disabled="materialUploadDisabled || materialUploadLoading">上传资料</el-button>
</el-upload> </el-upload>-->
</div> </div>
</el-form-item> </el-form-item>
<el-row :gutter="16"> <el-row :gutter="16">