hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-08 07:55:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev

Browse Source 
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
This commit is contained in:
YunaiV
2024-03-30 12:54:51 +08:00
parent 291dc51849 3820710c56
commit 34b788cb88
16 changed files with 844 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/bpm/form/index.vue
View File

@ -88,7 +88,7 @@
<!-- 表单详情的弹窗 -->
<Dialog v-model="detailVisible" title="表单详情" width="800">
<form-create :option="detailData.option" :rule="detailData.rule" />
<my-form-create :option="detailData.option" :rule="detailData.rule" />
</Dialog>
</template>