diff --git a/src/assets/1.png b/src/assets/1.png new file mode 100644 index 000000000..961869a83 Binary files /dev/null and b/src/assets/1.png differ diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 4f446fab4..8113e13bd 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -21,7 +21,10 @@ declare module '@vue/runtime-core' { DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default'] DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] +<<<<<<< HEAD ElAffix: typeof import('element-plus/es')['ElAffix'] +======= +>>>>>>> 9299e8c04ce00872839549eb7248e22456687126 ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -54,6 +57,10 @@ declare module '@vue/runtime-core' { ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] +<<<<<<< HEAD +======= + ElLink: typeof import('element-plus/es')['ElLink'] +>>>>>>> 9299e8c04ce00872839549eb7248e22456687126 ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] @@ -64,10 +71,10 @@ declare module '@vue/runtime-core' { ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSelectV2: typeof import('element-plus/es')['ElSelectV2'] ElSlider: typeof import('element-plus/es')['ElSlider'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] @@ -102,9 +109,16 @@ declare module '@vue/runtime-core' { HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] + IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] IEpDelete: typeof import('~icons/ep/delete')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] +<<<<<<< HEAD +======= + IEpMessageBox: typeof import('~icons/ep/message-box')['default'] + IEpOperation: typeof import('~icons/ep/operation')['default'] + IEpPicture: typeof import('~icons/ep/picture')['default'] +>>>>>>> 9299e8c04ce00872839549eb7248e22456687126 IEpPlus: typeof import('~icons/ep/plus')['default'] IEpRefresh: typeof import('~icons/ep/refresh')['default'] IEpSearch: typeof import('~icons/ep/search')['default'] diff --git a/src/views/hr/archives/basicinformation/appraisalrecord.vue b/src/views/hr/archives/basicinformation/appraisalrecord.vue new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/sysworkflow/codepage/cardadd.vue b/src/views/sysworkflow/codepage/cardadd.vue new file mode 100644 index 000000000..9cb5c1d90 --- /dev/null +++ b/src/views/sysworkflow/codepage/cardadd.vue @@ -0,0 +1,195 @@ + + + + + + \ No newline at end of file diff --git a/src/views/sysworkflow/codepage/cardedit.vue b/src/views/sysworkflow/codepage/cardedit.vue new file mode 100644 index 000000000..f4d3cf150 --- /dev/null +++ b/src/views/sysworkflow/codepage/cardedit.vue @@ -0,0 +1,190 @@ + + + + + \ No newline at end of file diff --git a/src/views/sysworkflow/codepage/page.vue b/src/views/sysworkflow/codepage/page.vue index b47deb9b1..7284b0f41 100644 --- a/src/views/sysworkflow/codepage/page.vue +++ b/src/views/sysworkflow/codepage/page.vue @@ -1,241 +1,213 @@ - - diff --git a/src/views/sysworkflow/codepage/page_123.vue b/src/views/sysworkflow/codepage/page_123.vue new file mode 100644 index 000000000..84b4df3ed --- /dev/null +++ b/src/views/sysworkflow/codepage/page_123.vue @@ -0,0 +1,368 @@ + + + + diff --git a/src/views/sysworkflow/codepage/page_black20240318.vue b/src/views/sysworkflow/codepage/page_black20240318.vue new file mode 100644 index 000000000..b47deb9b1 --- /dev/null +++ b/src/views/sysworkflow/codepage/page_black20240318.vue @@ -0,0 +1,241 @@ + + + +