diff --git a/_web/src/components/DepartmentSelect/DepartmentSelect.vue b/_web/src/components/DepartmentSelect/DepartmentSelect.vue new file mode 100644 index 00000000..5203efdb --- /dev/null +++ b/_web/src/components/DepartmentSelect/DepartmentSelect.vue @@ -0,0 +1,48 @@ + + diff --git a/_web/src/components/DepartmentSelect/index.js b/_web/src/components/DepartmentSelect/index.js new file mode 100644 index 00000000..68ac87d2 --- /dev/null +++ b/_web/src/components/DepartmentSelect/index.js @@ -0,0 +1,3 @@ +import DepartmentSelect from './DepartmentSelect' + +export default DepartmentSelect diff --git a/_web/src/components/UserSelect/UserSelect.vue b/_web/src/components/UserSelect/UserSelect.vue new file mode 100644 index 00000000..dc1e4e46 --- /dev/null +++ b/_web/src/components/UserSelect/UserSelect.vue @@ -0,0 +1,77 @@ + + diff --git a/_web/src/components/UserSelect/index.js b/_web/src/components/UserSelect/index.js new file mode 100644 index 00000000..813c0558 --- /dev/null +++ b/_web/src/components/UserSelect/index.js @@ -0,0 +1,3 @@ +import UserSelect from './UserSelect' + +export default UserSelect diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm index 9b609848..1a2f62ea 100644 --- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm +++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm @@ -26,6 +26,20 @@ has-feedback > #end +#if (${column.effectType} == "user") + #if (${column.whetherRequired} == "Y") + + #else + + #end +#end +#if (${column.effectType} == "depart") + #if (${column.whetherRequired} == "Y") + + #else + + #end +#end #if (${column.effectType} == "input") #if (${column.whetherRequired} == "Y") diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm index 15c3c93b..7c7b944a 100644 --- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm +++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm @@ -28,6 +28,20 @@ has-feedback > #end +#if (${column.effectType} == "user") + #if (${column.whetherRequired} == "Y") + + #else + + #end +#end +#if (${column.effectType} == "depart") + #if (${column.whetherRequired} == "Y") + + #else + + #end +#end #if (${column.effectType} == "input") #if (${column.whetherRequired} == "Y")