20 changed files with 892 additions and 808 deletions
Unified View
Diff Options
-
+28 -58admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
-
+12 -25admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
-
+265 -0admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
-
+162 -0admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
-
+84 -0admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.Style#Drawer.vue
-
+60 -0admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.vue
-
+9 -3jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/controller/TbIndustryController.java
-
+0 -82jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.api.ts
-
+0 -64jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.data.ts
-
+0 -272jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustryList.vue
-
+0 -87jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/components/TbIndustryModal.vue
-
+33 -15jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
-
+69 -52jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java
-
+2 -2jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java
-
+2 -4jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java
-
+2 -4jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java
-
+50 -50jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue
-
+34 -19jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue
-
+78 -69jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts
-
+2 -2jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue
+ 28
- 58
admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
View File
+ 12
- 25
admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
View File
+ 265
- 0
admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
View File
| @ -0,0 +1,265 @@ | |||||
| <template> | |||||
| <a-card :bordered="false"> | |||||
| <!-- 查询区域 --> | |||||
| <div class="table-page-search-wrapper"> | |||||
| <a-form layout="inline" @keyup.enter.native="searchQuery"> | |||||
| <a-row :gutter="24"> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="电话"> | |||||
| <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过"> | |||||
| <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> | |||||
| <a-button type="primary" @click="searchQuery" icon="search">查询</a-button> | |||||
| <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> | |||||
| <a @click="handleToggleSearch" style="margin-left: 8px"> | |||||
| {{ toggleSearchStatus ? '收起' : '展开' }} | |||||
| <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> | |||||
| </a> | |||||
| </span> | |||||
| </a-col> | |||||
| </a-row> | |||||
| </a-form> | |||||
| </div> | |||||
| <!-- 查询区域-END --> | |||||
| <!-- 操作按钮区域 --> | |||||
| <div class="table-operator"> | |||||
| <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> | |||||
| <a-button type="primary" icon="download" @click="handleExportXls('tb_user_role')">导出</a-button> | |||||
| <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> | |||||
| <a-button type="primary" icon="import">导入</a-button> | |||||
| </a-upload> | |||||
| <!-- 高级查询区域 --> | |||||
| <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> | |||||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||||
| <a-menu slot="overlay"> | |||||
| <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> | |||||
| </a-menu> | |||||
| <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> | |||||
| </a-dropdown> | |||||
| </div> | |||||
| <!-- table区域-begin --> | |||||
| <div> | |||||
| <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> | |||||
| <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 | |||||
| <a style="margin-left: 24px" @click="onClearSelected">清空</a> | |||||
| </div> | |||||
| <a-table | |||||
| ref="table" | |||||
| size="middle" | |||||
| :scroll="{x:true}" | |||||
| bordered | |||||
| rowKey="id" | |||||
| :columns="columns" | |||||
| :dataSource="dataSource" | |||||
| :pagination="ipagination" | |||||
| :loading="loading" | |||||
| :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" | |||||
| class="j-table-force-nowrap" | |||||
| @change="handleTableChange"> | |||||
| <template slot="htmlSlot" slot-scope="text"> | |||||
| <div v-html="text"></div> | |||||
| </template> | |||||
| <template slot="imgSlot" slot-scope="text,record"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||||
| <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> | |||||
| </template> | |||||
| <template slot="fileSlot" slot-scope="text"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||||
| <a-button | |||||
| v-else | |||||
| :ghost="true" | |||||
| type="primary" | |||||
| icon="download" | |||||
| size="small" | |||||
| @click="downloadFile(text)"> | |||||
| 下载 | |||||
| </a-button> | |||||
| </template> | |||||
| <span slot="action" slot-scope="text, record"> | |||||
| <a @click="handleEdit(record)">编辑</a> | |||||
| <a-divider type="vertical" /> | |||||
| <a-dropdown> | |||||
| <a class="ant-dropdown-link">更多 <a-icon type="down" /></a> | |||||
| <a-menu slot="overlay"> | |||||
| <a-menu-item> | |||||
| <a @click="handleDetail(record)">详情</a> | |||||
| </a-menu-item> | |||||
| <a-menu-item> | |||||
| <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> | |||||
| <a>删除</a> | |||||
| </a-popconfirm> | |||||
| </a-menu-item> | |||||
| </a-menu> | |||||
| </a-dropdown> | |||||
| </span> | |||||
| </a-table> | |||||
| </div> | |||||
| <tb-user-role-modal ref="modalForm" @ok="modalFormOk"></tb-user-role-modal> | |||||
| </a-card> | |||||
| </template> | |||||
| <script> | |||||
| import '@/assets/less/TableExpand.less' | |||||
| import { mixinDevice } from '@/utils/mixin' | |||||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||||
| import TbUserRoleModal from './modules/TbUserRoleModal' | |||||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||||
| export default { | |||||
| name: 'TbUserRoleList', | |||||
| mixins:[JeecgListMixin, mixinDevice], | |||||
| components: { | |||||
| TbUserRoleModal | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| description: 'tb_user_role管理页面', | |||||
| // 表头 | |||||
| columns: [ | |||||
| { | |||||
| title: '#', | |||||
| dataIndex: '', | |||||
| key:'rowIndex', | |||||
| width:60, | |||||
| align:"center", | |||||
| customRender:function (t,r,index) { | |||||
| return parseInt(index)+1; | |||||
| } | |||||
| }, | |||||
| { | |||||
| title:'用户名', | |||||
| align:"center", | |||||
| dataIndex: 'userName' | |||||
| }, | |||||
| { | |||||
| title:'地址', | |||||
| align:"center", | |||||
| dataIndex: 'address' | |||||
| }, | |||||
| { | |||||
| title:'工种', | |||||
| align:"center", | |||||
| dataIndex: 'industryName' | |||||
| }, | |||||
| { | |||||
| title:'个人简介', | |||||
| align:"center", | |||||
| dataIndex: 'detail' | |||||
| }, | |||||
| { | |||||
| title:'身份证上传', | |||||
| align:"center", | |||||
| dataIndex: 'idCard', | |||||
| scopedSlots: {customRender: 'imgSlot'} | |||||
| }, | |||||
| { | |||||
| title:'电话', | |||||
| align:"center", | |||||
| dataIndex: 'phone' | |||||
| }, | |||||
| { | |||||
| title:'年龄', | |||||
| align:"center", | |||||
| dataIndex: 'age' | |||||
| }, | |||||
| { | |||||
| title:'性别', | |||||
| align:"center", | |||||
| dataIndex: 'gender_dictText' | |||||
| }, | |||||
| { | |||||
| title:'期望薪资最小值', | |||||
| align:"center", | |||||
| dataIndex: 'moneyMin' | |||||
| }, | |||||
| { | |||||
| title:'期望薪资最大值', | |||||
| align:"center", | |||||
| dataIndex: 'moneyMax' | |||||
| }, | |||||
| { | |||||
| title:'角色', | |||||
| align:"center", | |||||
| dataIndex: 'role_dictText' | |||||
| }, | |||||
| { | |||||
| title:'审核状态 0审核中 1 审核通过 2审核未通过', | |||||
| align:"center", | |||||
| dataIndex: 'auditStatus_dictText' | |||||
| }, | |||||
| { | |||||
| title: '操作', | |||||
| dataIndex: 'action', | |||||
| align:"center", | |||||
| fixed:"right", | |||||
| width:147, | |||||
| scopedSlots: { customRender: 'action' } | |||||
| } | |||||
| ], | |||||
| url: { | |||||
| list: "/userRole/tbUserRole/list1", | |||||
| delete: "/userRole/tbUserRole/delete", | |||||
| deleteBatch: "/userRole/tbUserRole/deleteBatch", | |||||
| exportXlsUrl: "/userRole/tbUserRole/exportXls", | |||||
| importExcelUrl: "userRole/tbUserRole/importExcel", | |||||
| }, | |||||
| dictOptions:{}, | |||||
| superFieldList:[], | |||||
| } | |||||
| }, | |||||
| created() { | |||||
| this.getSuperFieldList(); | |||||
| }, | |||||
| computed: { | |||||
| importExcelUrl: function(){ | |||||
| return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; | |||||
| }, | |||||
| }, | |||||
| methods: { | |||||
| initDictConfig(){ | |||||
| }, | |||||
| getSuperFieldList(){ | |||||
| let fieldList=[]; | |||||
| fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''}) | |||||
| fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''}) | |||||
| fieldList.push({type:'Text',value:'idCard',text:'身份证上传',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'}) | |||||
| fieldList.push({type:'int',value:'moneyMin',text:'期望薪资最小值',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'moneyMax',text:'期望薪资最大值',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'}) | |||||
| fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'}) | |||||
| this.superFieldList = fieldList | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style scoped> | |||||
| @import '~@assets/less/common.less'; | |||||
| </style> | |||||
+ 162
- 0
admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
View File
| @ -0,0 +1,162 @@ | |||||
| <template> | |||||
| <a-spin :spinning="confirmLoading"> | |||||
| <j-form-container :disabled="formDisabled"> | |||||
| <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> | |||||
| <a-row> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName"> | |||||
| <a-input v-model="model.userName" placeholder="请输入用户名" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address"> | |||||
| <a-input v-model="model.address" placeholder="请输入地址" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="工种" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName"> | |||||
| <a-input v-model="model.industryName" placeholder="工种" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="个人简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail"> | |||||
| <a-textarea v-model="model.detail" rows="4" placeholder="请输入个人简介" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard"> | |||||
| <j-image-upload isMultiple v-model="model.idCard" ></j-image-upload> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone"> | |||||
| <a-input v-model="model.phone" placeholder="请输入电话" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age"> | |||||
| <a-input-number v-model="model.age" placeholder="请输入年龄" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gender"> | |||||
| <j-dict-select-tag type="list" v-model="model.gender" dictCode="sex" placeholder="请选择性别" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="期望薪资最小值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymin"> | |||||
| <a-input-number v-model="model.moneyMin" placeholder="请输入期望薪资最小值" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="期望薪资最大值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymax"> | |||||
| <a-input-number v-model="model.moneyMax" placeholder="请输入期望薪资最大值" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role"> | |||||
| <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="审核状态 0审核中 1 审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus"> | |||||
| <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| </a-row> | |||||
| </a-form-model> | |||||
| </j-form-container> | |||||
| </a-spin> | |||||
| </template> | |||||
| <script> | |||||
| import { httpAction, getAction } from '@/api/manage' | |||||
| import { validateDuplicateValue } from '@/utils/util' | |||||
| export default { | |||||
| name: 'TbUserRoleForm', | |||||
| components: { | |||||
| }, | |||||
| props: { | |||||
| //表单禁用 | |||||
| disabled: { | |||||
| type: Boolean, | |||||
| default: false, | |||||
| required: false | |||||
| } | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| model:{ | |||||
| }, | |||||
| labelCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 5 }, | |||||
| }, | |||||
| wrapperCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 16 }, | |||||
| }, | |||||
| confirmLoading: false, | |||||
| validatorRules: { | |||||
| }, | |||||
| url: { | |||||
| add: "/userRole/tbUserRole/add", | |||||
| edit: "/userRole/tbUserRole/edit", | |||||
| queryById: "/userRole/tbUserRole/queryById" | |||||
| } | |||||
| } | |||||
| }, | |||||
| computed: { | |||||
| formDisabled(){ | |||||
| return this.disabled | |||||
| }, | |||||
| }, | |||||
| created () { | |||||
| //备份model原始值 | |||||
| this.modelDefault = JSON.parse(JSON.stringify(this.model)); | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.edit(this.modelDefault); | |||||
| }, | |||||
| edit (record) { | |||||
| this.model = Object.assign({}, record); | |||||
| this.visible = true; | |||||
| }, | |||||
| submitForm () { | |||||
| const that = this; | |||||
| // 触发表单验证 | |||||
| this.$refs.form.validate(valid => { | |||||
| if (valid) { | |||||
| that.confirmLoading = true; | |||||
| let httpurl = ''; | |||||
| let method = ''; | |||||
| if(!this.model.id){ | |||||
| httpurl+=this.url.add; | |||||
| method = 'post'; | |||||
| }else{ | |||||
| httpurl+=this.url.edit; | |||||
| method = 'put'; | |||||
| } | |||||
| httpAction(httpurl,this.model,method).then((res)=>{ | |||||
| if(res.success){ | |||||
| that.$message.success(res.message); | |||||
| that.$emit('ok'); | |||||
| }else{ | |||||
| that.$message.warning(res.message); | |||||
| } | |||||
| }).finally(() => { | |||||
| that.confirmLoading = false; | |||||
| }) | |||||
| } | |||||
| }) | |||||
| }, | |||||
| } | |||||
| } | |||||
| </script> | |||||
+ 84
- 0
admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||||
| <template> | |||||
| <a-drawer | |||||
| :title="title" | |||||
| :width="width" | |||||
| placement="right" | |||||
| :closable="false" | |||||
| @close="close" | |||||
| destroyOnClose | |||||
| :visible="visible"> | |||||
| <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-user-role-form> | |||||
| <div class="drawer-footer"> | |||||
| <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> | |||||
| <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> | |||||
| </div> | |||||
| </a-drawer> | |||||
| </template> | |||||
| <script> | |||||
| import TbUserRoleForm from './TbUserRoleForm' | |||||
| export default { | |||||
| name: 'TbUserRoleModal', | |||||
| components: { | |||||
| TbUserRoleForm | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| title:"操作", | |||||
| width:800, | |||||
| visible: false, | |||||
| disableSubmit: false | |||||
| } | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.add(); | |||||
| }) | |||||
| }, | |||||
| edit (record) { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.edit(record); | |||||
| }); | |||||
| }, | |||||
| close () { | |||||
| this.$emit('close'); | |||||
| this.visible = false; | |||||
| }, | |||||
| submitCallback(){ | |||||
| this.$emit('ok'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleOk () { | |||||
| this.$refs.realForm.submitForm(); | |||||
| }, | |||||
| handleCancel () { | |||||
| this.close() | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style lang="less" scoped> | |||||
| /** Button按钮间距 */ | |||||
| .ant-btn { | |||||
| margin-left: 30px; | |||||
| margin-bottom: 30px; | |||||
| float: right; | |||||
| } | |||||
| .drawer-footer{ | |||||
| position: absolute; | |||||
| bottom: -8px; | |||||
| width: 100%; | |||||
| border-top: 1px solid #e8e8e8; | |||||
| padding: 10px 16px; | |||||
| text-align: right; | |||||
| left: 0; | |||||
| background: #fff; | |||||
| border-radius: 0 0 2px 2px; | |||||
| } | |||||
| </style> | |||||
+ 60
- 0
admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.vue
View File
| @ -0,0 +1,60 @@ | |||||
| <template> | |||||
| <j-modal | |||||
| :title="title" | |||||
| :width="width" | |||||
| :visible="visible" | |||||
| switchFullscreen | |||||
| @ok="handleOk" | |||||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||||
| @cancel="handleCancel" | |||||
| cancelText="关闭"> | |||||
| <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-user-role-form> | |||||
| </j-modal> | |||||
| </template> | |||||
| <script> | |||||
| import TbUserRoleForm from './TbUserRoleForm' | |||||
| export default { | |||||
| name: 'TbUserRoleModal', | |||||
| components: { | |||||
| TbUserRoleForm | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| title:'', | |||||
| width:800, | |||||
| visible: false, | |||||
| disableSubmit: false | |||||
| } | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.add(); | |||||
| }) | |||||
| }, | |||||
| edit (record) { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.edit(record); | |||||
| }) | |||||
| }, | |||||
| close () { | |||||
| this.$emit('close'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleOk () { | |||||
| this.$refs.realForm.submitForm(); | |||||
| }, | |||||
| submitCallback(){ | |||||
| this.$emit('ok'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleCancel () { | |||||
| this.close() | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
+ 9
- 3
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/controller/TbIndustryController.java
View File
+ 0
- 82
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.api.ts
View File
| @ -1,82 +0,0 @@ | |||||
| import {defHttp} from "/@/utils/http/axios"; | |||||
| import {Modal} from 'ant-design-vue'; | |||||
| enum Api { | |||||
| list = '/industry/tbIndustry/rootList', | |||||
| save='/industry/tbIndustry/add', | |||||
| edit='/industry/tbIndustry/edit', | |||||
| deleteTbIndustry = '/sys/tbIndustry/delete', | |||||
| deleteBatch = '/industry/tbIndustry/deleteBatch', | |||||
| importExcel = '/industry/tbIndustry/importExcel', | |||||
| exportXls = '/industry/tbIndustry/exportXls', | |||||
| loadTreeData = '/industry/tbIndustry/loadTreeRoot', | |||||
| getChildList = '/industry/tbIndustry/childList', | |||||
| getChildListBatch = '/industry/tbIndustry/getChildListBatch', | |||||
| } | |||||
| /** | |||||
| * 导出api | |||||
| * @param params | |||||
| */ | |||||
| export const getExportUrl = Api.exportXls; | |||||
| /** | |||||
| * 导入api | |||||
| * @param params | |||||
| */ | |||||
| export const getImportUrl = Api.importExcel; | |||||
| /** | |||||
| * 列表接口 | |||||
| * @param params | |||||
| */ | |||||
| export const list = (params) => | |||||
| defHttp.get({url: Api.list, params}); | |||||
| /** | |||||
| * 删除 | |||||
| */ | |||||
| export const deleteTbIndustry = (params,handleSuccess) => { | |||||
| return defHttp.delete({url: Api.deleteTbIndustry, params}, {joinParamsToUrl: true}).then(() => { | |||||
| handleSuccess(); | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 批量删除 | |||||
| * @param params | |||||
| */ | |||||
| export const batchDeleteTbIndustry = (params, handleSuccess) => { | |||||
| Modal.confirm({ | |||||
| title: '确认删除', | |||||
| content: '是否删除选中数据', | |||||
| okText: '确认', | |||||
| cancelText: '取消', | |||||
| onOk: () => { | |||||
| return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { | |||||
| handleSuccess(); | |||||
| }); | |||||
| } | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 保存或者更新 | |||||
| * @param params | |||||
| */ | |||||
| export const saveOrUpdateDict = (params, isUpdate) => { | |||||
| let url = isUpdate ? Api.edit : Api.save; | |||||
| return defHttp.post({url: url, params}); | |||||
| } | |||||
| /** | |||||
| * 查询全部树形节点数据 | |||||
| * @param params | |||||
| */ | |||||
| export const loadTreeData = (params) => | |||||
| defHttp.get({url: Api.loadTreeData,params}); | |||||
| /** | |||||
| * 查询子节点数据 | |||||
| * @param params | |||||
| */ | |||||
| export const getChildList = (params) => | |||||
| defHttp.get({url: Api.getChildList, params}); | |||||
| /** | |||||
| * 批量查询子节点数据 | |||||
| * @param params | |||||
| */ | |||||
| export const getChildListBatch = (params) => | |||||
| defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false}); | |||||
+ 0
- 64
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.data.ts
View File
| @ -1,64 +0,0 @@ | |||||
| import {BasicColumn} from '/@/components/Table'; | |||||
| import {FormSchema} from '/@/components/Table'; | |||||
| import { rules} from '/@/utils/helper/validator'; | |||||
| import { render } from '/@/utils/common/renderUtils'; | |||||
| //列表数据 | |||||
| export const columns: BasicColumn[] = [ | |||||
| { | |||||
| title: '行业名称', | |||||
| align:"center", | |||||
| dataIndex: 'name' | |||||
| }, | |||||
| { | |||||
| title: '菜单类型(0:一级行业菜单; 1:工种菜单)', | |||||
| align:"center", | |||||
| dataIndex: 'menuType_dictText' | |||||
| }, | |||||
| { | |||||
| title: '排序', | |||||
| align:"center", | |||||
| dataIndex: 'sortNo' | |||||
| }, | |||||
| { | |||||
| title: '图标', | |||||
| align:"center", | |||||
| dataIndex: 'icon', | |||||
| customRender:render.renderAvatar, | |||||
| }, | |||||
| ]; | |||||
| //查询数据 | |||||
| export const searchFormSchema: FormSchema[] = [ | |||||
| ]; | |||||
| //表单数据 | |||||
| export const formSchema: FormSchema[] = [ | |||||
| { | |||||
| label: '行业名称', | |||||
| field: 'name', | |||||
| component: 'Input', | |||||
| }, | |||||
| { | |||||
| label: '菜单类型(0:一级行业菜单; 1:工种菜单)', | |||||
| field: 'menuType', | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"emp_menu_type" | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '排序', | |||||
| field: 'sortNo', | |||||
| component: 'InputNumber', | |||||
| }, | |||||
| { | |||||
| label: '图标', | |||||
| field: 'icon', | |||||
| component: 'JImageUpload', | |||||
| componentProps:{ | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '父级节点', | |||||
| field: 'pid', | |||||
| component: 'Input', | |||||
| }, | |||||
| ]; | |||||
+ 0
- 272
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustryList.vue
View File
| @ -1,272 +0,0 @@ | |||||
| <template> | |||||
| <div class="p-4"> | |||||
| <!--引用表格--> | |||||
| <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess"> | |||||
| <!--插槽:table标题--> | |||||
| <template #tableTitle> | |||||
| <a-button type="primary" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button> | |||||
| <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> | |||||
| <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> | |||||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||||
| <template #overlay> | |||||
| <a-menu> | |||||
| <a-menu-item key="1" @click="batchHandleDelete"> | |||||
| <Icon icon="ant-design:delete-outlined"></Icon> | |||||
| 删除 | |||||
| </a-menu-item> | |||||
| </a-menu> | |||||
| </template> | |||||
| <a-button>批量操作 | |||||
| <Icon icon="ant-design:down-outlined"></Icon> | |||||
| </a-button> | |||||
| </a-dropdown> | |||||
| </template> | |||||
| <!--操作栏--> | |||||
| <template #action="{ record }"> | |||||
| <TableAction :actions="getTableAction(record)"/> | |||||
| </template> | |||||
| </BasicTable> | |||||
| <!--字典弹窗--> | |||||
| <TbIndustryModal @register="registerModal" @success="handleSuccess"/> | |||||
| </div> | |||||
| </template> | |||||
| <script lang="ts" name="industry-tbIndustry" setup> | |||||
| //ts语法 | |||||
| import {ref, computed, unref, toRaw, nextTick} from 'vue'; | |||||
| import {BasicTable, useTable, TableAction} from '/src/components/Table'; | |||||
| import {useModal} from '/src/components/Modal'; | |||||
| import { useListPage } from '/@/hooks/system/useListPage' | |||||
| import TbIndustryModal from './components/TbIndustryModal.vue'; | |||||
| import {columns} from './TbIndustry.data'; | |||||
| import {list, deleteTbIndustry, batchDeleteTbIndustry, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './TbIndustry.api'; | |||||
| const expandedRowKeys = ref([]); | |||||
| //字典model | |||||
| const [registerModal, {openModal}] = useModal(); | |||||
| //注册table数据 | |||||
| const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ | |||||
| tableProps:{ | |||||
| title: 'tb_industry', | |||||
| columns, | |||||
| canResize:false, | |||||
| actionColumn: { | |||||
| width: 120, | |||||
| }, | |||||
| }, | |||||
| exportConfig: { | |||||
| name:"tb_industry", | |||||
| url: getExportUrl, | |||||
| }, | |||||
| importConfig: { | |||||
| url: getImportUrl, | |||||
| success: importSuccess | |||||
| }, | |||||
| }) | |||||
| const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext | |||||
| /** | |||||
| * 新增事件 | |||||
| */ | |||||
| function handleCreate() { | |||||
| openModal(true, { | |||||
| isUpdate: false, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 编辑事件 | |||||
| */ | |||||
| async function handleEdit(record) { | |||||
| openModal(true, { | |||||
| record, | |||||
| isUpdate: true, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 详情 | |||||
| */ | |||||
| async function handleDetail(record) { | |||||
| openModal(true, { | |||||
| record, | |||||
| isUpdate: true, | |||||
| hideFooter: true, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 删除事件 | |||||
| */ | |||||
| async function handleDelete(record) { | |||||
| await deleteTbIndustry({id: record.id}, importSuccess); | |||||
| } | |||||
| /** | |||||
| * 批量删除事件 | |||||
| */ | |||||
| async function batchHandleDelete() { | |||||
| const ids = selectedRowKeys.value.filter(item => !item.includes('loading')) | |||||
| await batchDeleteTbIndustry({ids: ids}, importSuccess); | |||||
| } | |||||
| /** | |||||
| * 导入 | |||||
| */ | |||||
| function importSuccess() { | |||||
| reload() && (expandedRowKeys.value = []); | |||||
| } | |||||
| /** | |||||
| * 添加下级 | |||||
| */ | |||||
| function handleAddSub(record) { | |||||
| openModal(true, { | |||||
| record, | |||||
| isUpdate: false, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 成功回调 | |||||
| */ | |||||
| async function handleSuccess({isUpdate, values, expandedArr}) { | |||||
| if (isUpdate) { | |||||
| //编辑回调 | |||||
| updateTableDataRecord(values.id, values); | |||||
| } else { | |||||
| if(!values['pid']){ | |||||
| //新增根节点 | |||||
| reload(); | |||||
| }else{ | |||||
| //新增子集 | |||||
| expandedRowKeys.value = []; | |||||
| for (let key of unref(expandedArr)) { | |||||
| await expandTreeNode(key) | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| /** | |||||
| * 接口请求成功后回调 | |||||
| */ | |||||
| function onFetchSuccess(result) { | |||||
| getDataByResult(result.items)&&loadDataByExpandedRows(); | |||||
| } | |||||
| /** | |||||
| * 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据） | |||||
| */ | |||||
| async function loadDataByExpandedRows() { | |||||
| if (unref(expandedRowKeys).length > 0) { | |||||
| const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',')}); | |||||
| if (res.success && res.result.records.length>0) { | |||||
| //已展开的数据批量子节点 | |||||
| let records = res.result.records | |||||
| const listMap = new Map(); | |||||
| for (let item of records) { | |||||
| let pid = item['pid']; | |||||
| if (unref(expandedRowKeys).includes(pid)) { | |||||
| let mapList = listMap.get(pid); | |||||
| if (mapList == null) { | |||||
| mapList = []; | |||||
| } | |||||
| mapList.push(item); | |||||
| listMap.set(pid, mapList); | |||||
| } | |||||
| } | |||||
| let childrenMap = listMap; | |||||
| let fn = (list) => { | |||||
| if(list) { | |||||
| list.forEach(data => { | |||||
| if (unref(expandedRowKeys).includes(data.id)) { | |||||
| data.children = getDataByResult(childrenMap.get(data.id)) | |||||
| fn(data.children) | |||||
| } | |||||
| }) | |||||
| } | |||||
| }; | |||||
| fn(getDataSource()) | |||||
| } | |||||
| } | |||||
| } | |||||
| /** | |||||
| * 处理数据集 | |||||
| */ | |||||
| function getDataByResult(result){ | |||||
| if(result && result.length>0){ | |||||
| return result.map(item=>{ | |||||
| //判断是否标记了带有子节点 | |||||
| if(item["hasChild"]=='1'){ | |||||
| let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true } | |||||
| item.children = [loadChild] | |||||
| } | |||||
| return item | |||||
| }) | |||||
| } | |||||
| } | |||||
| /** | |||||
| *树节点展开合并 | |||||
| * */ | |||||
| async function handleExpand(expanded, record) { | |||||
| // 判断是否是展开状态，展开状态(expanded)并且存在子集(children)并且未加载过(isLoading)的就去查询子节点数据 | |||||
| if (expanded) { | |||||
| expandedRowKeys.value.push(record.id) | |||||
| if (record.children.length > 0 && !!record.children[0].isLoading) { | |||||
| let result = await getChildList({pid: record.id}); | |||||
| result=result.records?result.records:result; | |||||
| if (result && result.length > 0) { | |||||
| record.children = getDataByResult(result); | |||||
| } else { | |||||
| record.children = null | |||||
| record.hasChild = '0' | |||||
| } | |||||
| } | |||||
| } else { | |||||
| let keyIndex = expandedRowKeys.value.indexOf(record.id) | |||||
| if (keyIndex >= 0) { | |||||
| expandedRowKeys.value.splice(keyIndex, 1); | |||||
| } | |||||
| } | |||||
| } | |||||
| /** | |||||
| *操作表格后处理树节点展开合并 | |||||
| * */ | |||||
| async function expandTreeNode(key) { | |||||
| let record = findTableDataRecord(key) | |||||
| expandedRowKeys.value.push(key); | |||||
| let result = await getChildList({pid: key}); | |||||
| if (result && result.length > 0) { | |||||
| record.children = getDataByResult(result); | |||||
| } else { | |||||
| record.children = null | |||||
| record.hasChild = '0' | |||||
| } | |||||
| updateTableDataRecord(key, record); | |||||
| } | |||||
| /** | |||||
| * 操作栏 | |||||
| */ | |||||
| function getTableAction(record) { | |||||
| return [ | |||||
| { | |||||
| label: '编辑', | |||||
| onClick: handleEdit.bind(null, record), | |||||
| }, | |||||
| { | |||||
| label: '删除', | |||||
| popConfirm: { | |||||
| title: '确定删除吗?', | |||||
| confirm: handleDelete.bind(null, record), | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '添加下级', | |||||
| onClick: handleAddSub.bind(null, {pid: record.id}), | |||||
| } | |||||
| ] | |||||
| } | |||||
| </script> | |||||
| <style scoped> | |||||
| </style> | |||||
+ 0
- 87
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/components/TbIndustryModal.vue
View File
| @ -1,87 +0,0 @@ | |||||
| <template> | |||||
| <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit"> | |||||
| <BasicForm @register="registerForm"/> | |||||
| </BasicModal> | |||||
| </template> | |||||
| <script lang="ts" setup> | |||||
| import {ref, computed, unref} from 'vue'; | |||||
| import {BasicModal, useModalInner} from '/src/components/Modal'; | |||||
| import {BasicForm, useForm} from '/src/components/Form'; | |||||
| import {formSchema} from '../tbIndustry.data'; | |||||
| import {loadTreeData, saveOrUpdateDict} from '../tbIndustry.api'; | |||||
| // 获取emit | |||||
| const emit = defineEmits(['register', 'success']); | |||||
| const isUpdate = ref(true); | |||||
| const expandedRowKeys = ref([]); | |||||
| const treeData = ref([]); | |||||
| //表单配置 | |||||
| const [registerForm, {resetFields, setFieldsValue, validate, updateSchema}] = useForm({ | |||||
| schemas: formSchema, | |||||
| showActionButtonGroup: false, | |||||
| labelCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 4 }, | |||||
| }, | |||||
| wrapperCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 18 }, | |||||
| }, | |||||
| }); | |||||
| //表单赋值 | |||||
| const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => { | |||||
| //重置表单 | |||||
| await resetFields(); | |||||
| expandedRowKeys.value = []; | |||||
| setModalProps({confirmLoading: false, minHeight: 80}); | |||||
| isUpdate.value = !!data?.isUpdate; | |||||
| if (data?.record) { | |||||
| //表单赋值 | |||||
| await setFieldsValue({ | |||||
| ...data.record, | |||||
| }); | |||||
| } | |||||
| //父级节点树信息 | |||||
| treeData.value = await loadTreeData({'async': false,'pcode':''}); | |||||
| updateSchema({ | |||||
| field: 'pid', | |||||
| componentProps: {treeData}, | |||||
| }); | |||||
| }); | |||||
| //设置标题 | |||||
| const getTitle = computed(() => (!unref(isUpdate) ? '新增字典' : '编辑字典')); | |||||
| /** | |||||
| * 根据pid获取展开的节点 | |||||
| * @param pid | |||||
| * @param arr | |||||
| */ | |||||
| function getExpandKeysByPid(pid,arr){ | |||||
| if(pid && arr && arr.length>0){ | |||||
| for(let i=0;i<arr.length;i++){ | |||||
| if(arr[i].key==pid && unref(expandedRowKeys).indexOf(pid)<0){ | |||||
| expandedRowKeys.value.push(arr[i].key); | |||||
| getExpandKeysByPid(arr[i]['parentId'],unref(treeData)) | |||||
| }else{ | |||||
| getExpandKeysByPid(pid,arr[i].children) | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| //表单提交事件 | |||||
| async function handleSubmit() { | |||||
| try { | |||||
| let values = await validate(); | |||||
| setModalProps({confirmLoading: true}); | |||||
| //提交表单 | |||||
| await saveOrUpdateDict(values, isUpdate.value); | |||||
| //关闭弹窗 | |||||
| closeModal(); | |||||
| //展开的节点信息 | |||||
| await getExpandKeysByPid(values['pid'],unref(treeData)) | |||||
| //刷新列表(isUpdate:是否编辑;values:表单信息;expandedArr:展开的节点信息) | |||||
| emit('success', {isUpdate: unref(isUpdate), values:{...values},expandedArr: unref(expandedRowKeys).reverse()}); | |||||
| } finally { | |||||
| setModalProps({confirmLoading: false}); | |||||
| } | |||||
| } | |||||
| </script> | |||||