Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-11-25 16:02:16 +08:00
@@ -667,8 +667,8 @@
:disabled="formdisableflag" :disabled="formdisableflag"
></custom-textarea> ></custom-textarea>
</template> </template>
<!-- 起草单位--> <!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' "> <template v-else-if="field.attrType === 'SEL_OPTION'">
<template> <template>
<custom-select <custom-select
:key="field.attrField" :key="field.attrField"