Merge branch 'gaoang-2024-8' into 'dev'

feat: 审批提交弹窗可点x关闭，上传按钮disabled时隐藏

See merge request itc-framework/ma/2024/front!15

src/components/Form/src/components/Upload.vue

@@ -65,7 +65,7 @@
     >
       <plus-outlined v-if="listType == 'picture-card'" />
       <div :style="style" v-else>
-        <a-button :loading="loading" :disabled="loading">
+        <a-button :loading="loading" :disabled="loading" v-if="!disabled">
           <upload-outlined />
           点击上传
         </a-button>

src/components/SecondDev/OpinionDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <a-modal :mask-closable="false" :title="dialogTitle" :visible="isOpen" :width="500" centered class="geg">
+    <a-modal :mask-closable="false" :title="dialogTitle" :visible="isOpen" :width="500" centered class="geg" @cancel="onClickCancel">
         <template #footer>
             <a-button :disabled="loading" @click="onClickCancel">取消</a-button>
             <a-button :loading="loading" type="primary" @click="onClickOK">确定</a-button>