Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuIssueInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIssueInfoForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +15,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/admin/IssueInfo/components/IssueInfoModal.vue

@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuIssueInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIssueInfoForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +15,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue

@@ -1,17 +1,27 @@
 <template>
-  <j-modal :title="title" width="70vw" :visible="visible" @ok="handleOk"
+  <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
-    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <OrgApplyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </OrgApplyInfoForm>
-  </j-modal>
+    <template #footer>
-  <j-modal title="合同上传" width="70vw" :visible="contractVisible" @cancel="handleContractCancel">
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
+
+  <a-drawer :title="title" :width="`70vw`"  v-model:visible="contractVisible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    <OrgUpContractForm ref="upContractForm" @ok="submitContractCallback" :formBpm="false"></OrgUpContractForm>
     <template #footer>
       <a-button @click="handleContractCancel">关闭</a-button>
       <a-button @click="saveContract">保存为草稿</a-button>
       <a-button type="primary" @click="submitContract">保存并提交</a-button>
     </template>
-    <OrgUpContractForm ref="upContractForm" @ok="submitContractCallback" :formBpm="false"></OrgUpContractForm>
+  </a-drawer>
-  </j-modal>
+
+
+
+
 </template>
 
 <script lang="ts" setup>

src/views/admin/orgmodifyinfo/components/OrgModifyInfoModal.vue

@@ -1,12 +1,22 @@
 <template>
-  <j-modal :title="title" width="70vw" :visible="infoVisible" @ok="handleOk"
+  <a-drawer :title="title" width="70vw"  v-model:visible="visible" :closable="true"
-    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <OrgModifyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </OrgModifyInfoForm>
-  </j-modal>
+    <template #footer>
-  <j-modal :title="'机构信息变更审核'" width="70vw" :visible="hisVisible" @ok="handleModifyOk" @cancel="handleCancel" cancelText="关闭">
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
+  
+  <a-drawer :title="'机构信息变更审核'" width="70vw"  v-model:visible="hisVisible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <OrgHistoryForm ref="historyRef" @ok="submitCallback" v-if="hisVisible"></OrgHistoryForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>