Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue

@@ -5,6 +5,7 @@
    :maskClosable="false"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :title="title"
    @cancel="handleCancel">
     <equipment-scrap-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>